tvl-depot/third_party/git/po/zh_CN.po

23258 lines
645 KiB
Text
Raw Normal View History

# Chinese translations for Git package
# Git 软件包的简体中文翻译.
# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
# This file is distributed under the same license as the Git package.
# Contributors:
# - Fangyi Zhou <me AT fangyi.io>
# - Jiang Xin <worldhello.net AT gmail.com>
# - Lian Cheng <rhythm.mail AT gmail.com>
# - Ray Chen <oldsharp AT gmail.com>
# - Riku <lu.riku AT gmail.com>
# - Thynson <lanxingcan AT gmail.com>
# - ws3389 <willsmith3389 AT gmail.com>
# - Wang Sheng <wangsheng2008love AT 163.com>
# - 依云 <lilydjwg AT gmail.com>
# - Yichao Yu <yyc1992 AT gmail.com>
# - Zhuang Ya <zhuangya AT me.com>
#
# Git glossary for Chinese translators
#
# English | Chinese
# ---------------------------------+--------------------------------------
# 3-way merge | 三方合并
# abbreviate | 简写(的 SHA-1 值)
# alternate object database | 备用对象库
# amend | 修补
# ancestor | 祖先,祖先提交
# annotated tag | 附注标签
# bare repository | 纯仓库
# bisect | 二分查找
# blob object | 数据对象
# branch | 分支
# bundle | 包
# bypass | 绕过
# cache | 索引(的别称)
# chain | (提交)链
# changeset | 变更集
# checkout | 检出
# checksum | 校验,校验和
# cherry-picking | 拣选
# clean | 干净(的工作区)
# clone | 克隆
# commit | 提交
# commit message | 提交说明
# commit object | 提交对象
# commit-ish (also committish) | 提交号
# conflict | 冲突
# core Git | 核心 Git 工具
# cover letter | 附函
# DAG | 有向无环图
# dangling object | 悬空对象
# detached HEAD | 分离头指针
# directory | 目录
# dirty | 脏(的工作区)
# dumb HTTP protocol | 哑 HTTP 协议
# evil merge | 坏合并(合并引入了父提交没有的修改)
# fast-forward | 快进
# fetch | 获取
# file system | 文件系统
# fork | 派生
# Git archive | 仓库(对于 arch 用户)
# gitfile | gitfile仓库链接文件
# grafts | (提交)移植
# hash | 哈希值
# HEAD | HEAD头指针亦即当前分支
# head | 头、分支
# head ref | 分支
# header | 头信息
# hook | 钩子
# hunk | 补丁片段
# index | 索引
# index entry | 索引条目
# loose object | 松散对象
# loose refs | 松散引用
# master | master默认分支名
# merge | 合并
# object | 对象
# object database | 对象库
# object identifier | 对象标识符
# object name | 对象名称
# object type | 对象类型
# octopus | 章鱼式合并(两分支以上的合并)
# origin | origin默认的远程名称
# pack | 包
# pack index | 包索引
# packfile | 包文件
# parent | 父提交
# patch | 补丁
# pathspec | 路径规格
# pattern | 模式
# pickaxe | 挖掘
# plumbing | 管件Git 底层核心命令的别称)
# porcelain | 瓷件Git 上层封装命令的别称)
# precious-objects repo | 珍品仓库
# prune | 清除
# pull | 拉,拉取
# push | 推,推送
# reachable | 可达
# rebase | 变基
# ref | 引用
# reflog | 引用日志
# refspec | 引用规格
# remote | 远程,远程仓库
# remote-tracking branch | 远程跟踪分支
# replay | 重放
# repo | 仓库
# repository | 仓库
# resolve | (冲突)解决
# revert | 还原
# revision | 版本
# rewind | 回退
# SCM | 源代码管理(工具)
# SHA-1 | SHA-1安全哈希算法1
# shallow repository | 浅(克隆)仓库
# signed tag | 签名标签
# smart HTTP protocol | 智能 HTTP 协议
# squash | 压缩
# stage | n. 暂存区(即索引); v. 暂存
# stash | n. 贮藏区; v. 贮藏
# submodule | 子模组
# symref | 符号引用
# tag | n. 标签; v. 打标签
# tag object | 标签对象
# tagger | 打标签者
# topic branch | 主题分支
# track | 跟踪
# trailer | 尾部署名
# tree | 树(工作区或树对象)
# tree object | 树对象
# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
# unmerged index | 未合并索引
# unpack | 解包
# unreachable object | 不可达对象
# unstage | 取消暂存
# upstream | 上游
# upstream branch | 上游分支
# working tree | 工作区
#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2019-08-10 20:12+0800\n"
"PO-Revision-Date: 2019-08-13 21:16+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: advice.c:109
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%s提示%.*s%s\n"
#: advice.c:162
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "无法拣选,因为您有未合并的文件。"
#: advice.c:164
msgid "Committing is not possible because you have unmerged files."
msgstr "无法提交,因为您有未合并的文件。"
#: advice.c:166
msgid "Merging is not possible because you have unmerged files."
msgstr "无法合并,因为您有未合并的文件。"
#: advice.c:168
msgid "Pulling is not possible because you have unmerged files."
msgstr "无法拉取,因为您有未合并的文件。"
#: advice.c:170
msgid "Reverting is not possible because you have unmerged files."
msgstr "无法回退,因为您有未合并的文件。"
#: advice.c:172
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "无法 %s因为您有未合并的文件。"
#: advice.c:180
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
"解决方案并提交。"
#: advice.c:188
msgid "Exiting because of an unresolved conflict."
msgstr "因为存在未解决的冲突而退出。"
#: advice.c:193 builtin/merge.c:1327
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并(存在 MERGE_HEAD。"
#: advice.c:195
msgid "Please, commit your changes before merging."
msgstr "请在合并前先提交您的修改。"
#: advice.c:196
msgid "Exiting because of unfinished merge."
msgstr "因为存在未完成的合并而退出。"
#: advice.c:202
#, c-format
msgid ""
"Note: switching to '%s'.\n"
"\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
"state without impacting any branches by switching back to a branch.\n"
"\n"
"If you want to create a new branch to retain commits you create, you may\n"
"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
" git switch -c <new-branch-name>\n"
"\n"
"Or undo this operation with:\n"
"\n"
" git switch -\n"
"\n"
"Turn off this advice by setting config variable advice.detachedHead to "
"false\n"
"\n"
msgstr ""
"注意:正在切换到 '%s'。\n"
"\n"
"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以在切换\n"
"回一个分支时,丢弃在此状态下所做的提交而不对分支造成影响。\n"
"\n"
"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在 switch 命令\n"
"中添加参数 -c 来实现(现在或稍后)。例如:\n"
"\n"
" git switch -c <新分支名>\n"
"\n"
"或者撤销此操作:\n"
"\n"
" git switch -\n"
"\n"
"通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
"\n"
#: alias.c:50
msgid "cmdline ends with \\"
msgstr "命令行以 \\ 结尾"
#: alias.c:51
msgid "unclosed quote"
msgstr "未关闭的引号"
#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "未能识别的空白字符选项 '%s'"
#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "未能识别的空白字符忽略选项 '%s'"
#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject 和 --3way 不能同时使用。"
#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached 和 --3way 不能同时使用。"
#: apply.c:140
msgid "--3way outside a repository"
msgstr "--3way 在一个仓库之外"
#: apply.c:151
msgid "--index outside a repository"
msgstr "--index 在一个仓库之外"
#: apply.c:154
msgid "--cached outside a repository"
msgstr "--cached 在一个仓库之外"
#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "无法准备时间戳正则表达式 %s"
#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d输入为%s"
#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "不能在补丁的第 %d 行找到文件名"
#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply错误的 git-diff - 应为 /dev/null但在第 %2$d 行得到 %1$s"
#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply错误的 git-diff - 第 %d 行上新文件名不一致"
#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply错误的 git-diff - 第 %d 行上旧文件名不一致"
#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply错误的 git-diff - 第 %d 行处应为 /dev/null"
#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "第 %d 行包含无效文件模式:%s"
#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "不一致的文件头,%d 行和 %d 行"
#: apply.c:1460
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount意外的行%.*s"
#: apply.c:1529
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的补丁片段没有头信息:%.*s"
#: apply.c:1551
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
"component (line %d)"
msgid_plural ""
"git diff header lacks filename information when removing %d leading pathname "
"components (line %d)"
msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
#: apply.c:1564
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
#: apply.c:1752
msgid "new file depends on old contents"
msgstr "新文件依赖旧内容"
#: apply.c:1754
msgid "deleted file still has contents"
msgstr "删除的文件仍有内容"
#: apply.c:1788
#, c-format
msgid "corrupt patch at line %d"
msgstr "补丁在第 %d 行损坏"
#: apply.c:1825
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s 依赖旧内容"
#: apply.c:1827
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s 仍有内容"
#: apply.c:1830
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告:文件 %s 成为空文件但并未删除"
#: apply.c:1977
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补丁在第 %d 行损坏:%.*s"
#: apply.c:2014
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补丁位于第 %d 行"
#: apply.c:2176
#, c-format
msgid "patch with only garbage at line %d"
msgstr "补丁文件的第 %d 行只有垃圾数据"
#: apply.c:2262
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读取符号链接 %s"
#: apply.c:2266
#, c-format
msgid "unable to open or read %s"
msgstr "不能打开或读取 %s"
#: apply.c:2925
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符:'%c'"
#: apply.c:3046
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "块 #%d 成功应用于 %d偏移 %d 行)"
msgstr[1] "块 #%d 成功应用于 %d偏移 %d 行)"
#: apply.c:3058
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文减少到(%ld/%ld以在第 %d 行应用补丁片段"
#: apply.c:3064
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
"当查询:\n"
"%.*s"
#: apply.c:3086
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补丁数据"
#: apply.c:3094
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
#: apply.c:3141
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
#: apply.c:3151
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "补丁应用到 '%s'%s但是和当前内容不匹配。"
#: apply.c:3159
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "补丁应用到空文件 '%s',但其并非空文件"
#: apply.c:3177
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
#: apply.c:3190
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补丁未应用到 '%s'"
#: apply.c:3196
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s却为 %s"
#: apply.c:3217
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补丁失败:%s:%ld"
#: apply.c:3340
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"
#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"
#: apply.c:3400
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "读取位于符号链接中的 '%s'"
#: apply.c:3429 apply.c:3672
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"
#: apply.c:3515 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s不存在于索引中"
#: apply.c:3524 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s和索引不匹配"
#: apply.c:3559
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
#: apply.c:3562
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "回落到三方合并...\n"
#: apply.c:3578 apply.c:3582
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "无法读取 '%s' 的当前内容"
#: apply.c:3594
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "无法回落到三方合并...\n"
#: apply.c:3608
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "应用补丁到 '%s' 存在冲突。\n"
#: apply.c:3613
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "成功应用补丁到 '%s'。\n"
#: apply.c:3639
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"
#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s错误类型"
#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o应为 %o"
#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
#: read-cache.c:1309
#, c-format
msgid "invalid path '%s'"
msgstr "无效路径 '%s'"
#: apply.c:3923
#, c-format
msgid "%s: already exists in index"
msgstr "%s已经存在于索引中"
#: apply.c:3926
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s已经存在于工作区中"
#: apply.c:3946
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式(%1$o和旧模式%3$o不匹配"
#: apply.c:3951
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s 的新模式(%1$o和 %4$s 的旧模式(%3$o不匹配"
#: apply.c:3971
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影响的文件 '%s' 位于符号链接中"
#: apply.c:3975
#, c-format
msgid "%s: patch does not apply"
msgstr "%s补丁未应用"
#: apply.c:3990
#, c-format
msgid "Checking patch %s..."
msgstr "正在检查补丁 %s..."
#: apply.c:4082
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模组 %s 的 sha1 信息缺失或无效"
#: apply.c:4089
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式变更,但它不在当前 HEAD 中"
#: apply.c:4092
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 信息缺失或无效(%s。"
#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
#: apply.c:4101
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在临时索引中添加 %s"
#: apply.c:4111
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把临时索引写入到 %s"
#: apply.c:4249
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
#: apply.c:4283
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模组 %s 损坏的补丁"
#: apply.c:4289
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能对新建文件 '%s' 调用 stat"
#: apply.c:4297
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
#: apply.c:4303 apply.c:4448
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
#: apply.c:4346
#, c-format
msgid "failed to write to '%s'"
msgstr "写入 '%s' 失败"
#: apply.c:4350
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
#: apply.c:4420
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
#: apply.c:4518
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
#: apply.c:4526
msgid "internal error"
msgstr "内部错误"
#: apply.c:4529
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
#: apply.c:4540
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
#, c-format
msgid "cannot open %s"
msgstr "不能打开 %s"
#: apply.c:4562
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
#: apply.c:4566
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
#: apply.c:4676
#, c-format
msgid "Skipped patch '%s'."
msgstr "略过补丁 '%s'。"
#: apply.c:4684
msgid "unrecognized input"
msgstr "未能识别的输入"
#: apply.c:4704
msgid "unable to read index file"
msgstr "无法读取索引文件"
#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能打开补丁 '%s'%s"
#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字符误用。"
msgstr[1] "%d 行新增了空白字符误用。"
#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "修复空白错误后,应用了 %d 行。"
msgstr[1] "修复空白错误后,应用了 %d 行。"
#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
#: builtin/pull.c:208 builtin/submodule--helper.c:407
#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
msgid "path"
msgstr "路径"
#: apply.c:4944
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
#: apply.c:4947
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
#: apply.c:4949 builtin/am.c:2217
msgid "num"
msgstr "数字"
#: apply.c:4950
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
#: apply.c:4953
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
#: apply.c:4955
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁而是显示输入的差异统计diffstat"
#: apply.c:4959
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"
#: apply.c:4961
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁,而是显示输入的概要"
#: apply.c:4963
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁,而是查看补丁是否可应用"
#: apply.c:4965
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
#: apply.c:4967
msgid "mark new files with `git add --intent-to-add`"
msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
#: apply.c:4969
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
#: apply.c:4971
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作区之外文件的补丁"
#: apply.c:4974
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
#: apply.c:4976
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三方合并"
#: apply.c:4978
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
#: apply.c:4983
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
msgid "action"
msgstr "动作"
#: apply.c:4985
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
#: apply.c:4988 apply.c:4991
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
#: apply.c:4994
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
#: apply.c:4996
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
#: apply.c:4998
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
#: apply.c:5000
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "冗长输出"
#: apply.c:5003
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
#: apply.c:5006
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
#: apply.c:5008 builtin/am.c:2205
msgid "root"
msgstr "根目录"
#: apply.c:5009
msgid "prepend <root> to all filenames"
msgstr "为所有文件名前添加 <根目录>"
#: archive.c:14
msgid "git archive [<options>] <tree-ish> [<path>...]"
msgstr "git archive [<选项>] <树或提交> [<路径>...]"
#: archive.c:15
msgid "git archive --list"
msgstr "git archive --list"
#: archive.c:16
msgid ""
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
msgstr ""
"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
#: archive.c:17
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <仓库> [--exec <命令>] --list"
#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规格 '%s' 未匹配任何文件"
#: archive.c:396
#, c-format
msgid "no such ref: %.*s"
msgstr "无此引用:%.*s"
#: archive.c:401
#, c-format
msgid "not a valid object name: %s"
msgstr "不是一个有效的对象名:%s"
#: archive.c:414
#, c-format
msgid "not a tree object: %s"
msgstr "不是一个树对象:%s"
#: archive.c:426
msgid "current working directory is untracked"
msgstr "当前工作目录未被跟踪"
#: archive.c:457
msgid "fmt"
msgstr "格式"
#: archive.c:457
msgid "archive format"
msgstr "归档格式"
#: archive.c:458 builtin/log.c:1580
msgid "prefix"
msgstr "前缀"
#: archive.c:459
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
msgid "file"
msgstr "文件"
#: archive.c:461 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "归档写入此文件"
#: archive.c:463
msgid "read .gitattributes in working directory"
msgstr "读取工作区中的 .gitattributes"
#: archive.c:464
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"
#: archive.c:465
msgid "store only"
msgstr "只存储"
#: archive.c:466
msgid "compress faster"
msgstr "压缩速度更快"
#: archive.c:474
msgid "compress better"
msgstr "压缩效果更好"
#: archive.c:477
msgid "list supported archive formats"
msgstr "列出支持的归档格式"
#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
msgid "repo"
msgstr "仓库"
#: archive.c:480 builtin/archive.c:92
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库(<仓库>)提取归档文件"
#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707
#: builtin/notes.c:498
msgid "command"
msgstr "命令"
#: archive.c:482 builtin/archive.c:94
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
#: archive.c:489
msgid "Unexpected option --remote"
msgstr "未知参数 --remote"
#: archive.c:491
msgid "Option --exec can only be used together with --remote"
msgstr "选项 --exec 只能和 --remote 同时使用"
#: archive.c:493
msgid "Unexpected option --output"
msgstr "未知参数 --output"
#: archive.c:515
#, c-format
msgid "Unknown archive format '%s'"
msgstr "未知归档格式 '%s'"
#: archive.c:522
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "参数不支持此格式 '%s'-%d"
#: archive-tar.c:125 archive-zip.c:345
#, c-format
msgid "cannot stream blob %s"
msgstr "不能打开数据对象 %s"
#: archive-tar.c:260 archive-zip.c:363
#, c-format
msgid "unsupported file mode: 0%o (SHA1: %s)"
msgstr "不支持的文件模式0%o (SHA1: %s)"
#: archive-tar.c:287 archive-zip.c:353
#, c-format
msgid "cannot read %s"
msgstr "不能读取 %s"
#: archive-tar.c:459
#, c-format
msgid "unable to start '%s' filter"
msgstr "无法启动 '%s' 过滤器"
#: archive-tar.c:462
msgid "unable to redirect descriptor"
msgstr "无法重定向描述符"
#: archive-tar.c:469
#, c-format
msgid "'%s' filter reported error"
msgstr "'%s' 过滤器报告了错误"
#: archive-zip.c:314
#, c-format
msgid "path is not valid UTF-8: %s"
msgstr "路径不是有效的 UTF-8%s"
#: archive-zip.c:318
#, c-format
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr "路径太长(%d 字符SHA1%s%s"
#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
#, c-format
msgid "deflate error (%d)"
msgstr "压缩错误 (%d)"
#: archive-zip.c:609
#, c-format
msgid "timestamp too large for this system: %<PRIuMAX>"
msgstr "对于本系统时间戳太大:%<PRIuMAX>"
#: attr.c:211
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s 不是一个有效的属性名"
#: attr.c:368
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "不允许 %s%s:%d"
#: attr.c:408
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
"负值模版在 git attributes 中被忽略\n"
"当字符串确实要以感叹号开始时,使用 '\\!'。"
#: bisect.c:468
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "文件 '%s' 包含错误的引用格式:%s"
#: bisect.c:678
#, c-format
msgid "We cannot bisect more!\n"
msgstr "我们无法进行更多的二分查找!\n"
#: bisect.c:733
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一个有效的提交名 %s"
#: bisect.c:758
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
"合并基线 %s 是坏的。\n"
"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
#: bisect.c:763
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
"合并基线 %s 是新的。\n"
"介于 %s 和 [%s] 之间的属性已经被修改。\n"
#: bisect.c:768
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
"合并基线 %s 是 %s。\n"
"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
#: bisect.c:776
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
"git bisect cannot work properly in this case.\n"
"Maybe you mistook %s and %s revs?\n"
msgstr ""
"一些 %s 版本不是 %s 版本的祖先。\n"
"这种情况下 git 二分查找无法正常工作。\n"
"您可能弄错了 %s 和 %s 版本?\n"
#: bisect.c:789
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
"So we cannot be sure the first %s commit is between %s and %s.\n"
"We continue anyway."
msgstr ""
"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"
"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
"我们仍旧继续。"
#: bisect.c:822
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分查找中:合并基线必须是经过测试的\n"
#: bisect.c:865
#, c-format
msgid "a %s revision is needed"
msgstr "需要一个 %s 版本"
#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
#: bisect.c:928 builtin/merge.c:148
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"
#: bisect.c:958
msgid "reading bisect refs failed"
msgstr "读取二分查找引用失败"
#: bisect.c:977
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同时为 %s 和 %s\n"
#: bisect.c:985
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
"没有发现可测试的提交。\n"
"可能您在运行时使用了错误的路径参数?\n"
#: bisect.c:1004
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
msgstr[0] "(大概 %d 步)"
msgstr[1] "(大概 %d 步)"
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
#: bisect.c:1010
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n"
#: blame.c:2697
msgid "--contents and --reverse do not blend well."
msgstr "--contents 和 --reverse 不能混用。"
#: blame.c:2711
msgid "cannot use --contents with final commit object name"
msgstr "不能将 --contents 和最终的提交对象名共用"
#: blame.c:2732
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
#: blame.c:2759
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
#: blame.c:2770
#, c-format
msgid "no such path %s in %s"
msgstr "在 %2$s 中无此路径 %1$s"
#: blame.c:2781
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "不能为路径 %2$s 读取数据对象 %1$s"
#: branch.c:53
#, c-format
msgid ""
"\n"
"After fixing the error cause you may try to fix up\n"
"the remote tracking information by invoking\n"
"\"git branch --set-upstream-to=%s%s%s\"."
msgstr ""
"\n"
"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
"\"git branch --set-upstream-to=%s%s%s\" 。"
#: branch.c:67
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "未设置分支 %s 作为它自己的上游。"
#: branch.c:93
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。"
#: branch.c:94
#, c-format
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。"
#: branch.c:98
#, c-format
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。"
#: branch.c:99
#, c-format
msgid "Branch '%s' set up to track local branch '%s'."
msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
#: branch.c:104
#, c-format
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
#: branch.c:105
#, c-format
msgid "Branch '%s' set up to track remote ref '%s'."
msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
#: branch.c:109
#, c-format
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。"
#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
#: branch.c:119
msgid "Unable to write upstream branch configuration"
msgstr "无法写入上游分支配置"
#: branch.c:156
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "未跟踪:引用 %s 有歧义"
#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' 不是一个有效的分支名称。"
#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "一个分支名 '%s' 已经存在。"
#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "无法强制更新当前分支。"
#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "请求的上游分支 '%s' 不存在"
#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"branch that already exists at the remote, you may need to\n"
"run \"git fetch\" to retrieve it.\n"
"\n"
"If you are planning to push out a new local branch that\n"
"will track its remote counterpart, you may want to use\n"
"\"git push -u\" to set the upstream config as you push."
msgstr ""
"\n"
"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
"您可能需要执行 \"git fetch\" 来获取分支。\n"
"\n"
"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
#: branch.c:281
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "不是一个有效的对象名:'%s'。"
#: branch.c:301
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "歧义的对象名:'%s'。"
#: branch.c:306
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "无效的分支点:'%s'。"
#: branch.c:364
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' 已经检出到 '%s'"
#: branch.c:387
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "工作区 %s 的 HEAD 指向没有被更新"
#: bundle.c:36
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr "'%s' 不像是一个 v2 版本的包文件"
#: bundle.c:64
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头:%s%s (%d)"
#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
#: builtin/commit.c:791
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
#: bundle.c:143
msgid "Repository lacks these prerequisite commits:"
msgstr "仓库中缺少这些必备的提交:"
#: bundle.c:146
msgid "need a repository to verify a bundle"
msgstr "需要一个仓库来校验一个包"
#: bundle.c:197
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "这个包中含有这个引用:"
msgstr[1] "这个包中含有 %d 个引用:"
#: bundle.c:204
msgid "The bundle records a complete history."
msgstr "这个包记录一个完整历史。"
#: bundle.c:206
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "这个包需要这个引用:"
msgstr[1] "这个包需要 %d 个引用:"
#: bundle.c:272
msgid "unable to dup bundle descriptor"
msgstr "无法复制 bundle 描述符"
#: bundle.c:279
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 进程"
#: bundle.c:290
msgid "pack-objects died"
msgstr "pack-objects 终止"
#: bundle.c:332
msgid "rev-list died"
msgstr "rev-list 终止"
#: bundle.c:381
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数:%s"
#: bundle.c:468
msgid "Refusing to create empty bundle."
msgstr "不能创建空包。"
#: bundle.c:478
#, c-format
msgid "cannot create '%s'"
msgstr "不能创建 '%s'"
#: bundle.c:503
msgid "index-pack died"
msgstr "index-pack 终止"
#: color.c:296
#, c-format
msgid "invalid color value: %.*s"
msgstr "无效的颜色值:%.*s"
#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
#: commit.c:52
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一个提交!"
#: commit.c:192
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
"\n"
"Please use \"git replace --convert-graft-file\"\n"
"to convert the grafts into replace refs.\n"
"\n"
"Turn this message off by running\n"
"\"git config advice.graftFileDeprecated false\""
msgstr ""
"对 <GIT_DIR>/info/grafts 的支持已被弃用,并将在\n"
"未来的Git版本中被移除。\n"
"\n"
"请使用 \"git replace --convert-graft-file\" 将\n"
"grafts 转换为替换引用。\n"
"\n"
"设置 \"git config advice.graftFileDeprecated false\"\n"
"可关闭本消息"
#: commit.c:1127
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
#: commit.c:1130
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
#: commit.c:1133
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 没有 GPG 签名。"
#: commit.c:1136
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
#: commit.c:1390
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr ""
"警告:提交说明不符合 UTF-8 字符编码。\n"
"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
"设置为您项目所用的字符编码。\n"
#: commit-graph.c:127
msgid "commit-graph file is too small"
msgstr "提交图形文件太小"
#: commit-graph.c:192
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr "提交图形签名 %X 和签名 %X 不匹配"
#: commit-graph.c:199
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr "提交图形版本 %X 和版本 %X 不匹配"
#: commit-graph.c:206
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
#: commit-graph.c:229
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr "提交图形块查找表条目丢失,文件可能不完整"
#: commit-graph.c:240
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr "提交图形不正确的块偏移 %08x%08x"
#: commit-graph.c:283
#, c-format
msgid "commit-graph chunk id %08x appears multiple times"
msgstr "提交图形块 id %08x 出现了多次"
#: commit-graph.c:347
msgid "commit-graph has no base graphs chunk"
msgstr "提交图形没有基础图形块"
#: commit-graph.c:357
msgid "commit-graph chain does not match"
msgstr "提交图形链不匹配"
#: commit-graph.c:404
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr "无效的提交图形链:行 '%s' 不是一个哈希值"
#: commit-graph.c:430
msgid "unable to find all commit-graph files"
msgstr "无法找到所有提交图形文件"
#: commit-graph.c:554 commit-graph.c:614
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr "无效的提交位置。提交图形可能已损坏"
#: commit-graph.c:575
#, c-format
msgid "could not find commit %s"
msgstr "无法找到提交 %s"
#: commit-graph.c:1002 builtin/pack-objects.c:2657
#, c-format
msgid "unable to get type of object %s"
msgstr "无法获得对象 %s 类型"
#: commit-graph.c:1034
msgid "Loading known commits in commit graph"
msgstr "正在加载提交图中的已知提交"
#: commit-graph.c:1051
msgid "Expanding reachable commits in commit graph"
msgstr "正在扩展提交图中的可达提交"
#: commit-graph.c:1070
msgid "Clearing commit marks in commit graph"
msgstr "正在清除提交图中的提交标记"
#: commit-graph.c:1089
msgid "Computing commit graph generation numbers"
msgstr "正在计算提交图世代数字"
#: commit-graph.c:1163
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] "正在 %d 个包中查找提交图的提交"
msgstr[1] "正在 %d 个包中查找提交图的提交"
#: commit-graph.c:1176
#, c-format
msgid "error adding pack %s"
msgstr "添加包 %s 出错"
#: commit-graph.c:1180
#, c-format
msgid "error opening index for %s"
msgstr "为 %s 打开索引出错"
#: commit-graph.c:1204
#, c-format
msgid "Finding commits for commit graph from %d ref"
msgid_plural "Finding commits for commit graph from %d refs"
msgstr[0] "正在从 %d 个引用中查找提交图的提交"
msgstr[1] "正在从 %d 个引用中查找提交图的提交"
#: commit-graph.c:1238
msgid "Finding commits for commit graph among packed objects"
msgstr "正在打包对象中查找提交图的提交"
#: commit-graph.c:1253
msgid "Counting distinct commits in commit graph"
msgstr "正在计算提交图中不同的提交"
#: commit-graph.c:1284
msgid "Finding extra edges in commit graph"
msgstr "正在查找提交图中额外的边"
#: commit-graph.c:1332
msgid "failed to write correct number of base graph ids"
msgstr "无法写入正确数量的基础图形 ID"
#: commit-graph.c:1365 midx.c:811
#, c-format
msgid "unable to create leading directories of %s"
msgstr "不能为 %s 创建先导目录"
#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
#, c-format
msgid "unable to create '%s'"
msgstr "不能创建 '%s'"
#: commit-graph.c:1437
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] "正在用 %d 步写出提交图"
msgstr[1] "正在用 %d 步写出提交图"
#: commit-graph.c:1478
msgid "unable to open commit-graph chain file"
msgstr "无法打开提交图形链文件"
#: commit-graph.c:1490
msgid "failed to rename base commit-graph file"
msgstr "无法重命名基础提交图形文件"
#: commit-graph.c:1510
msgid "failed to rename temporary commit-graph file"
msgstr "无法重命名临时提交图形文件"
#: commit-graph.c:1621
msgid "Scanning merged commits"
msgstr "正在扫描合并提交"
#: commit-graph.c:1632
#, c-format
msgid "unexpected duplicate commit id %s"
msgstr "意外的重复提交 ID %s"
#: commit-graph.c:1657
msgid "Merging commit-graph"
msgstr "正在合并提交图形"
#: commit-graph.c:1844
#, c-format
msgid "the commit graph format cannot write %d commits"
msgstr "提交图格式不能写入 %d 个提交"
#: commit-graph.c:1855
msgid "too many commits to write graph"
msgstr "提交太多不能画图"
#: commit-graph.c:1945
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr "提交图文件的校验码错误,可能已经损坏"
#: commit-graph.c:1955
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s"
#: commit-graph.c:1965 commit-graph.c:1980
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr "提交图形有不正确的扇出值fanout[%d] = %u != %u"
#: commit-graph.c:1972
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr "无法从提交图形中解析提交 %s"
#: commit-graph.c:1989
msgid "Verifying commits in commit graph"
msgstr "正在校验提交图中的提交"
#: commit-graph.c:2002
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr "无法从提交图形的对象库中解析提交 %s"
#: commit-graph.c:2009
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
#: commit-graph.c:2019
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr "提交 %s 的提交图形父提交列表太长了"
#: commit-graph.c:2028
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr "%s 的提交图形父提交是 %s != %s"
#: commit-graph.c:2041
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr "提交 %s 的提交图形父提交列表过早终止"
#: commit-graph.c:2046
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零"
#: commit-graph.c:2050
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零"
#: commit-graph.c:2065
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr "提交图形中的提交 %s 的世代号是 %u != %u"
#: commit-graph.c:2071
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "内存耗尽"
#: config.c:124
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
"\t%s\n"
"from\n"
"\t%s\n"
"This might be due to circular includes."
msgstr ""
"超过了最大包含深度(%1$d当从\n"
"\t%3$s\n"
"包含\n"
"\t%2$s\n"
"这可能是因为循环包含。"
#: config.c:140
#, c-format
msgid "could not expand include path '%s'"
msgstr "无法扩展包含路径 '%s'"
#: config.c:151
msgid "relative config includes must come from files"
msgstr "相对路径的配置文件引用必须来自于文件"
#: config.c:197
msgid "relative config include conditionals must come from files"
msgstr "相对路径的配置文件条件引用必须来自于文件"
#: config.c:376
#, c-format
msgid "key does not contain a section: %s"
msgstr "键名没有包含一个小节名称:%s"
#: config.c:382
#, c-format
msgid "key does not contain variable name: %s"
msgstr "键名没有包含变量名:%s"
#: config.c:406 sequencer.c:2463
#, c-format
msgid "invalid key: %s"
msgstr "无效键名:%s"
#: config.c:412
#, c-format
msgid "invalid key (newline): %s"
msgstr "无效键名(有换行符):%s"
#: config.c:448 config.c:460
#, c-format
msgid "bogus config parameter: %s"
msgstr "伪配置参数:%s"
#: config.c:495
#, c-format
msgid "bogus format in %s"
msgstr "%s 中格式错误"
#: config.c:821
#, c-format
msgid "bad config line %d in blob %s"
msgstr "数据对象 %2$s 中错误的配置行 %1$d"
#: config.c:825
#, c-format
msgid "bad config line %d in file %s"
msgstr "文件 %2$s 中错误的配置行 %1$d"
#: config.c:829
#, c-format
msgid "bad config line %d in standard input"
msgstr "标准输入中错误的配置行 %d"
#: config.c:833
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
#: config.c:837
#, c-format
msgid "bad config line %d in command line %s"
msgstr "命令行 %2$s 中错误的配置行 %1$d"
#: config.c:841
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中错误的配置行 %1$d"
#: config.c:978
msgid "out of range"
msgstr "超出范围"
#: config.c:978
msgid "invalid unit"
msgstr "无效的单位"
#: config.c:979
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
#: config.c:998
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'%4$s"
#: config.c:1001
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'%4$s"
#: config.c:1004
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'%3$s"
#: config.c:1007
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'%4$s"
#: config.c:1010
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'%4$s"
#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'%4$s"
#: config.c:1108
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "无法扩展用户目录:'%s'"
#: config.c:1117
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
#: config.c:1208
#, c-format
msgid "abbrev length out of range: %d"
msgstr "缩写长度超出范围:%d"
#: config.c:1222 config.c:1233
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"
#: config.c:1325
msgid "core.commentChar should only be one character"
msgstr "core.commentChar 应该是一个字符"
#: config.c:1358
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式:%s"
#: config.c:1430
#, c-format
msgid "malformed value for %s"
msgstr "%s 的取值格式错误"
#: config.c:1456
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s 的取值格式错误:%s"
#: config.c:1457
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "必须是其中之一nothing、matching、simple、upstream 或 current"
#: config.c:1518 builtin/pack-objects.c:3410
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
#: config.c:1639
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "无法从数据对象 '%s' 加载配置"
#: config.c:1642
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "引用 '%s' 没有指向一个数据对象"
#: config.c:1659
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "不能解析配置对象 '%s'"
#: config.c:1689
#, c-format
msgid "failed to parse %s"
msgstr "解析 %s 失败"
#: config.c:1745
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
#: config.c:2094
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
#: config.c:2264
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s'%s'"
#: config.c:2307
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'"
#: config.c:2333
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
#: config.c:2379
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解析命令行配置中的 '%s'"
#: config.c:2381
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
#: config.c:2462
#, c-format
msgid "invalid section name '%s'"
msgstr "无效的小节名称 '%s'"
#: config.c:2494
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
#: config.c:2523
#, c-format
msgid "failed to write new configuration file %s"
msgstr "写入新的配置文件 %s 失败"
#: config.c:2775 config.c:3099
#, c-format
msgid "could not lock config file %s"
msgstr "不能锁定配置文件 %s"
#: config.c:2786
#, c-format
msgid "opening %s"
msgstr "打开 %s"
#: config.c:2821 builtin/config.c:328
#, c-format
msgid "invalid pattern: %s"
msgstr "无效模式:%s"
#: config.c:2846
#, c-format
msgid "invalid config file %s"
msgstr "无效的配置文件 %s"
#: config.c:2859 config.c:3112
#, c-format
msgid "fstat on %s failed"
msgstr "对 %s 调用 fstat 失败"
#: config.c:2870
#, c-format
msgid "unable to mmap '%s'"
msgstr "不能 mmap '%s'"
#: config.c:2879 config.c:3117
#, c-format
msgid "chmod on %s failed"
msgstr "对 %s 调用 chmod 失败"
#: config.c:2964 config.c:3214
#, c-format
msgid "could not write config file %s"
msgstr "不能写入配置文件 %s"
#: config.c:2998
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
#: config.c:3000 builtin/remote.c:782
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"
#: config.c:3090
#, c-format
msgid "invalid section name: %s"
msgstr "无效的小节名称:%s"
#: config.c:3257
#, c-format
msgid "missing value for '%s'"
msgstr "%s 的取值缺失"
#: connect.c:61
msgid "the remote end hung up upon initial contact"
msgstr "远端在初始连接时即挂断"
#: connect.c:63
msgid ""
"Could not read from remote repository.\n"
"\n"
"Please make sure you have the correct access rights\n"
"and the repository exists."
msgstr ""
"无法读取远程仓库。\n"
"\n"
"请确认您有正确的访问权限并且仓库存在。"
#: connect.c:81
#, c-format
msgid "server doesn't support '%s'"
msgstr "服务器不支持 '%s'"
#: connect.c:103
#, c-format
msgid "server doesn't support feature '%s'"
msgstr "服务器不支持特性 '%s'"
#: connect.c:114
msgid "expected flush after capabilities"
msgstr "在能力之后应为一个 flush 包"
#: connect.c:233
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr "忽略第一行 '%s' 之后的能力字段"
#: connect.c:252
msgid "protocol error: unexpected capabilities^{}"
msgstr "协议错误:意外的 capabilities^{}"
#: connect.c:273
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr "协议错误:预期浅克隆 sha-1却得到 '%s'"
#: connect.c:275
msgid "repository on the other end cannot be shallow"
msgstr "另一端的仓库不能是浅克隆仓库"
#: connect.c:313
msgid "invalid packet"
msgstr "无效数据包"
#: connect.c:333
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "协议错误:意外的 '%s'"
#: connect.c:441
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "无效的 ls-refs 响应:%s"
#: connect.c:445
msgid "expected flush after ref listing"
msgstr "在引用列表之后应该有一个 flush 包"
#: connect.c:544
#, c-format
msgid "protocol '%s' is not supported"
msgstr "不支持 '%s' 协议"
#: connect.c:595
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "无法为 socket 设置 SO_KEEPALIVE"
#: connect.c:635 connect.c:698
#, c-format
msgid "Looking up %s ... "
msgstr "查找 %s ..."
#: connect.c:639
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "无法查找 %s端口 %s%s"
#. TRANSLATORS: this is the end of "Looking up %s ... "
#: connect.c:643 connect.c:714
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
"完成。\n"
"连接到 %s端口 %s... "
#: connect.c:665 connect.c:742
#, c-format
msgid ""
"unable to connect to %s:\n"
"%s"
msgstr ""
"无法连接到 %s\n"
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
#: connect.c:671 connect.c:748
msgid "done."
msgstr "完成。"
#: connect.c:702
#, c-format
msgid "unable to look up %s (%s)"
msgstr "无法查找 %s%s"
#: connect.c:708
#, c-format
msgid "unknown port %s"
msgstr "未知端口 %s"
#: connect.c:845 connect.c:1171
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "已阻止奇怪的主机名 '%s'"
#: connect.c:847
#, c-format
msgid "strange port '%s' blocked"
msgstr "已阻止奇怪的端口号 '%s'"
#: connect.c:857
#, c-format
msgid "cannot start proxy %s"
msgstr "不能启动代理 %s"
#: connect.c:924
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "未指定路径,执行 'git help pull' 查看有效的 url 语法"
#: connect.c:1119
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh 变体 'simple' 不支持 -4"
#: connect.c:1131
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh 变体 'simple' 不支持 -6"
#: connect.c:1148
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh 变体 'simple' 不支持设置端口"
#: connect.c:1260
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "已阻止奇怪的路径名 '%s'"
#: connect.c:1307
msgid "unable to fork"
msgstr "无法 fork"
#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
msgid "Checking connectivity"
msgstr "正在检查连通性"
#: connected.c:98
msgid "Could not run 'git rev-list'"
msgstr "不能执行 'git rev-list'"
#: connected.c:118
msgid "failed write to rev-list"
msgstr "写入 rev-list 失败"
#: connected.c:125
msgid "failed to close rev-list's stdin"
msgstr "关闭 rev-list 的标准输入失败"
#: convert.c:193
#, c-format
msgid "illegal crlf_action %d"
msgstr "非法的 crlf 动作 %d"
#: convert.c:206
#, c-format
msgid "CRLF would be replaced by LF in %s"
msgstr "%s 中的 CRLF 将被 LF 替换"
#: convert.c:208
#, c-format
msgid ""
"CRLF will be replaced by LF in %s.\n"
"The file will have its original line endings in your working directory"
msgstr ""
"%s 中的 CRLF 将被 LF 替换。<\n"
"在工作区中该文件仍保持原有的换行符。"
#: convert.c:216
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "文件 %s 中的 LF 将被 CRLF 替换"
#: convert.c:218
#, c-format
msgid ""
"LF will be replaced by CRLF in %s.\n"
"The file will have its original line endings in your working directory"
msgstr ""
"%s 中的 LF 将被 CRLF 替换。\n"
"在工作区中该文件仍保持原有的换行符"
#: convert.c:279
#, c-format
msgid "BOM is prohibited in '%s' if encoded as %s"
msgstr "如果使用 %2$s 编码,禁止在 '%1$s' 中使用 BOM"
#: convert.c:286
#, c-format
msgid ""
"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
"tree-encoding."
msgstr "文件 '%s' 包含一个字节顺序标记BOM。请使用 UTF-%s 作为工作区编码。"
#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
msgstr "如果编码为 %2$s需要在 '%1$s' 中使用 BOM"
#: convert.c:306
#, c-format
msgid ""
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
"%sLE (depending on the byte order) as working-tree-encoding."
msgstr ""
"文件 '%s' 缺失一个字节顺序标记BOM。请使用 UTF-%sBE or UTF-%sLE取决于字"
"节序)作为工作区编码。"
#: convert.c:424 convert.c:495
#, c-format
msgid "failed to encode '%s' from %s to %s"
msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"
#: convert.c:467
#, c-format
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
#: convert.c:673
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "不能 fork 以执行外部过滤器 '%s'"
#: convert.c:693
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "不能将输入传递给外部过滤器 '%s'"
#: convert.c:700
#, c-format
msgid "external filter '%s' failed %d"
msgstr "外部过滤器 '%s' 失败码 %d"
#: convert.c:735 convert.c:738
#, c-format
msgid "read from external filter '%s' failed"
msgstr "从外部过滤器 '%s' 读取失败"
#: convert.c:741 convert.c:796
#, c-format
msgid "external filter '%s' failed"
msgstr "外部过滤器 '%s' 失败"
#: convert.c:844
msgid "unexpected filter type"
msgstr "意外的过滤类型"
#: convert.c:855
msgid "path name too long for external filter"
msgstr "外部过滤器的路径名太长"
#: convert.c:929
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
"been filtered"
msgstr "外部过滤器 '%s' 不再可用,但并非所有路径都已过滤"
#: convert.c:1228
msgid "true/false are no valid working-tree-encodings"
msgstr "true/false 不是有效的工作区编码"
#: convert.c:1398 convert.c:1432
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%sclean 过滤器 '%s' 失败"
#: convert.c:1476
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%ssmudge 过滤器 %s 失败"
#: date.c:137
msgid "in the future"
msgstr "在将来"
#: date.c:143
#, c-format
msgid "%<PRIuMAX> second ago"
msgid_plural "%<PRIuMAX> seconds ago"
msgstr[0] "%<PRIuMAX> 秒钟前"
msgstr[1] "%<PRIuMAX> 秒钟前"
#: date.c:150
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
msgstr[0] "%<PRIuMAX> 分钟前"
msgstr[1] "%<PRIuMAX> 分钟前"
#: date.c:157
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
msgstr[0] "%<PRIuMAX> 小时前"
msgstr[1] "%<PRIuMAX> 小时前"
#: date.c:164
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
msgstr[0] "%<PRIuMAX> 天前"
msgstr[1] "%<PRIuMAX> 天前"
#: date.c:170
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
msgstr[0] "%<PRIuMAX> 周前"
msgstr[1] "%<PRIuMAX> 周前"
#: date.c:177
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
msgstr[0] "%<PRIuMAX> 个月前"
msgstr[1] "%<PRIuMAX> 个月前"
#: date.c:188
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
msgstr[0] "%<PRIuMAX> 年"
msgstr[1] "%<PRIuMAX> 年"
#. TRANSLATORS: "%s" is "<n> years"
#: date.c:191
#, c-format
msgid "%s, %<PRIuMAX> month ago"
msgid_plural "%s, %<PRIuMAX> months ago"
msgstr[0] "%s %<PRIuMAX> 个月前"
msgstr[1] "%s %<PRIuMAX> 个月前"
#: date.c:196 date.c:201
#, c-format
msgid "%<PRIuMAX> year ago"
msgid_plural "%<PRIuMAX> years ago"
msgstr[0] "%<PRIuMAX> 年前"
msgstr[1] "%<PRIuMAX> 年前"
#: delta-islands.c:272
msgid "Propagating island marks"
msgstr "正在传播数据岛标记"
#: delta-islands.c:290
#, c-format
msgid "bad tree object %s"
msgstr "坏的树对象 %s"
#: delta-islands.c:334
#, c-format
msgid "failed to load island regex for '%s': %s"
msgstr "未能加载 '%s' 的数据岛正则表达式:%s"
#: delta-islands.c:390
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
msgstr "来自 config 的数据岛正则表达式有太多的捕获组(最多 %d 个)"
#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "已标记 %d 个数据岛,结束。\n"
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
msgstr "读取排序文件 '%s' 失败"
#: diffcore-rename.c:544
msgid "Performing inexact rename detection"
msgstr "正在进行非精确的重命名探测"
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
msgstr "git diff --no-index [<选项>] <路径> <路径>"
#: diff-no-index.c:263
msgid ""
"Not a git repository. Use --no-index to compare two paths outside a working "
"tree"
msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径"
# 译者:注意保持前导空格
#: diff.c:155
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " 无法解析 dirstat 截止cut-off百分比 '%s'\n"
# 译者:注意保持前导空格
#: diff.c:160
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 未知的 dirstat 参数 '%s'\n"
#: diff.c:296
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
msgstr ""
"移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "
"'plain'"
#: diff.c:324
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
msgstr ""
"未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-"
"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
#: diff.c:332
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
msgstr "color-moved-wsallow-indentation-change 不能与其它空白字符模式共用"
#: diff.c:405
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
#: diff.c:465
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
"发现配置变量 'diff.dirstat' 中的错误:\n"
"%s"
#: diff.c:4215
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出,停止在 %s"
#: diff.c:4560
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
#: diff.c:4563
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G、-S 和 --find-object 是互斥的"
#: diff.c:4641
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明确要求只跟一个路径规格"
#: diff.c:4689
#, c-format
msgid "invalid --stat value: %s"
msgstr "无效的 --stat 值:%s"
#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
#: parse-options.c:199 parse-options.c:203
#, c-format
msgid "%s expects a numerical value"
msgstr "%s 期望一个数字值"
#: diff.c:4726
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
"无法解析 --dirstat/-X 选项的参数:\n"
"%s"
#: diff.c:4811
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
#: diff.c:4835
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "ws-error-highlight=%.*s 之后未知的值"
#: diff.c:4849
#, c-format
msgid "unable to resolve '%s'"
msgstr "不能解析 '%s'"
#: diff.c:4899 diff.c:4905
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s 期望 <n>/<m> 格式"
#: diff.c:4917
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s 期望一个字符,得到 '%s'"
#: diff.c:4938
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "坏的 --color-moved 参数:%s"
#: diff.c:4957
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "--color-moved-ws 中的无效模式 '%s' "
#: diff.c:4997
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
#: diff.c:5033 diff.c:5053
#, c-format
msgid "invalid argument to %s"
msgstr "%s 的参数无效"
#: diff.c:5191
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数:'%s'"
#: diff.c:5247
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "坏的 --word-diff 参数:%s"
#: diff.c:5270
msgid "Diff output format options"
msgstr "差异输出格式化选项"
#: diff.c:5272 diff.c:5278
msgid "generate patch"
msgstr "生成补丁"
#: diff.c:5275 builtin/log.c:172
msgid "suppress diff output"
msgstr "不显示差异输出"
#: diff.c:5280 diff.c:5394 diff.c:5401
msgid "<n>"
msgstr "<n>"
#: diff.c:5281 diff.c:5284
msgid "generate diffs with <n> lines context"
msgstr "生成含 <n> 行上下文的差异"
#: diff.c:5286
msgid "generate the diff in raw format"
msgstr "生成原始格式的差异"
#: diff.c:5289
msgid "synonym for '-p --raw'"
msgstr "和 '-p --raw' 同义"
#: diff.c:5293
msgid "synonym for '-p --stat'"
msgstr "和 '-p --stat' 同义"
#: diff.c:5297
msgid "machine friendly --stat"
msgstr "机器友好的 --stat"
#: diff.c:5300
msgid "output only the last line of --stat"
msgstr "只输出 --stat 的最后一行"
#: diff.c:5302 diff.c:5310
msgid "<param1,param2>..."
msgstr "<参数1,参数2>..."
#: diff.c:5303
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "输出每个子目录相对变更的分布"
#: diff.c:5307
msgid "synonym for --dirstat=cumulative"
msgstr "和 --dirstat=cumulative 同义"
#: diff.c:5311
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "是 --dirstat=files,param1,param2... 的同义词"
#: diff.c:5315
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "如果变更中引入冲突定界符或空白错误,给出警告"
#: diff.c:5318
msgid "condensed summary such as creations, renames and mode changes"
msgstr "精简摘要,例如创建、重命名和模式变更"
#: diff.c:5321
msgid "show only names of changed files"
msgstr "只显示变更文件的文件名"
#: diff.c:5324
msgid "show only names and status of changed files"
msgstr "只显示变更文件的文件名和状态"
#: diff.c:5326
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
#: diff.c:5327
msgid "generate diffstat"
msgstr "生成差异统计diffstat"
#: diff.c:5329 diff.c:5332 diff.c:5335
msgid "<width>"
msgstr "<宽度>"
#: diff.c:5330
msgid "generate diffstat with a given width"
msgstr "使用给定的长度生成差异统计"
#: diff.c:5333
msgid "generate diffstat with a given name width"
msgstr "使用给定的文件名长度生成差异统计"
#: diff.c:5336
msgid "generate diffstat with a given graph width"
msgstr "使用给定的图形长度生成差异统计"
#: diff.c:5338
msgid "<count>"
msgstr "<次数>"
#: diff.c:5339
msgid "generate diffstat with limited lines"
msgstr "生成有限行数的差异统计"
#: diff.c:5342
msgid "generate compact summary in diffstat"
msgstr "生成差异统计的简洁摘要"
#: diff.c:5345
msgid "output a binary diff that can be applied"
msgstr "输出一个可以应用的二进制差异"
#: diff.c:5348
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "在 \"index\" 行显示完整的前后对象名称"
#: diff.c:5350
msgid "show colored diff"
msgstr "显示带颜色的差异"
#: diff.c:5351
msgid "<kind>"
msgstr "<类型>"
#: diff.c:5352
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr "对于差异中的上下文、旧的和新的行,加亮显示错误的空白字符"
#: diff.c:5355
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
"在 --raw 或者 --numstat 中,不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
"符"
#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
msgid "<prefix>"
msgstr "<前缀>"
#: diff.c:5359
msgid "show the given source prefix instead of \"a/\""
msgstr "显示给定的源前缀取代 \"a/\""
#: diff.c:5362
msgid "show the given destination prefix instead of \"b/\""
msgstr "显示给定的目标前缀取代 \"b/\""
#: diff.c:5365
msgid "prepend an additional prefix to every line of output"
msgstr "输出的每一行附加前缀"
#: diff.c:5368
msgid "do not show any source or destination prefix"
msgstr "不显示任何源和目标前缀"
#: diff.c:5371
msgid "show context between diff hunks up to the specified number of lines"
msgstr "显示指定行数的差异块间的上下文"
#: diff.c:5375 diff.c:5380 diff.c:5385
msgid "<char>"
msgstr "<字符>"
#: diff.c:5376
msgid "specify the character to indicate a new line instead of '+'"
msgstr "指定一个字符取代 '+' 来表示新的一行"
#: diff.c:5381
msgid "specify the character to indicate an old line instead of '-'"
msgstr "指定一个字符取代 '-' 来表示旧的一行"
#: diff.c:5386
msgid "specify the character to indicate a context instead of ' '"
msgstr "指定一个字符取代 ' ' 来表示一行上下文"
#: diff.c:5389
msgid "Diff rename options"
msgstr "差异重命名选项"
#: diff.c:5390
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
#: diff.c:5391
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "将完全重写的变更打破为成对的删除和创建"
#: diff.c:5395
msgid "detect renames"
msgstr "检测重命名"
#: diff.c:5399
msgid "omit the preimage for deletes"
msgstr "省略删除操作的差异输出"
#: diff.c:5402
msgid "detect copies"
msgstr "检测拷贝"
#: diff.c:5406
msgid "use unmodified files as source to find copies"
msgstr "使用未修改的文件做为发现拷贝的源"
#: diff.c:5408
msgid "disable rename detection"
msgstr "禁用重命名探测"
#: diff.c:5411
msgid "use empty blobs as rename source"
msgstr "使用空的数据对象做为重命名的源"
#: diff.c:5413
msgid "continue listing the history of a file beyond renames"
msgstr "继续列出文件重命名以外的历史记录"
#: diff.c:5416
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr "如果重命名/拷贝目标超过给定的限制,禁止重命名/拷贝检测"
#: diff.c:5418
msgid "Diff algorithm options"
msgstr "差异算法选项"
#: diff.c:5420
msgid "produce the smallest possible diff"
msgstr "生成尽可能小的差异"
#: diff.c:5423
msgid "ignore whitespace when comparing lines"
msgstr "行比较时忽略空白字符"
#: diff.c:5426
msgid "ignore changes in amount of whitespace"
msgstr "忽略空白字符的变更"
#: diff.c:5429
msgid "ignore changes in whitespace at EOL"
msgstr "忽略行尾的空白字符变更"
#: diff.c:5432
msgid "ignore carrier-return at the end of line"
msgstr "忽略行尾的回车符CR"
#: diff.c:5435
msgid "ignore changes whose lines are all blank"
msgstr "忽略整行都是空白的变更"
#: diff.c:5438
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "启发式转换差异边界以便阅读"
#: diff.c:5441
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "使用 \"patience diff\" 算法生成差异"
#: diff.c:5445
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "使用 \"histogram diff\" 算法生成差异"
#: diff.c:5447
msgid "<algorithm>"
msgstr "<算法>"
#: diff.c:5448
msgid "choose a diff algorithm"
msgstr "选择一个差异算法"
#: diff.c:5450
msgid "<text>"
msgstr "<文本>"
#: diff.c:5451
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "使用 \"anchored diff\" 算法生成差异"
#: diff.c:5453 diff.c:5462 diff.c:5465
msgid "<mode>"
msgstr "<模式>"
#: diff.c:5454
msgid "show word diff, using <mode> to delimit changed words"
msgstr "显示单词差异,使用 <模式> 分隔变更的单词"
#: diff.c:5456 diff.c:5459 diff.c:5504
msgid "<regex>"
msgstr "<正则>"
#: diff.c:5457
msgid "use <regex> to decide what a word is"
msgstr "使用 <正则表达式> 确定何为一个词"
#: diff.c:5460
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
#: diff.c:5463
msgid "moved lines of code are colored differently"
msgstr "移动的代码行用不同方式着色"
#: diff.c:5466
msgid "how white spaces are ignored in --color-moved"
msgstr "在 --color-moved 下如何忽略空白字符"
#: diff.c:5469
msgid "Other diff options"
msgstr "其它差异选项"
#: diff.c:5471
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr "当从子目录运行,排除目录之外的变更并显示相对路径"
#: diff.c:5475
msgid "treat all files as text"
msgstr "把所有文件当做文本处理"
#: diff.c:5477
msgid "swap two inputs, reverse the diff"
msgstr "交换两个输入,反转差异"
#: diff.c:5479
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "有差异时退出码为 1否则为 0"
#: diff.c:5481
msgid "disable all output of the program"
msgstr "禁用本程序的所有输出"
#: diff.c:5483
msgid "allow an external diff helper to be executed"
msgstr "允许执行一个外置的差异助手"
#: diff.c:5485
msgid "run external text conversion filters when comparing binary files"
msgstr "当比较二进制文件时,运行外部的文本转换过滤器"
#: diff.c:5487
msgid "<when>"
msgstr "<何时>"
#: diff.c:5488
msgid "ignore changes to submodules in the diff generation"
msgstr "在生成差异时,忽略子模组的更改"
#: diff.c:5491
msgid "<format>"
msgstr "<格式>"
#: diff.c:5492
msgid "specify how differences in submodules are shown"
msgstr "指定子模组的差异如何显示"
#: diff.c:5496
msgid "hide 'git add -N' entries from the index"
msgstr "隐藏索引中 'git add -N' 条目"
#: diff.c:5499
msgid "treat 'git add -N' entries as real in the index"
msgstr "将索引中 'git add -N' 条目当做真实的"
#: diff.c:5501
msgid "<string>"
msgstr "<字符串>"
#: diff.c:5502
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "查找改变了指定字符串出现次数的差异"
#: diff.c:5505
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "查找改变指定正则匹配出现次数的差异"
#: diff.c:5508
msgid "show all changes in the changeset with -S or -G"
msgstr "显示使用 -S 或 -G 的变更集的所有变更"
#: diff.c:5511
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
#: diff.c:5514
msgid "control the order in which files appear in the output"
msgstr "控制输出中的文件显示顺序"
#: diff.c:5515
msgid "<object-id>"
msgstr "<对象 ID>"
#: diff.c:5516
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "查找改变指定对象出现次数的差异"
#: diff.c:5518
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
#: diff.c:5519
msgid "select files by diff type"
msgstr "通过差异类型选择文件"
#: diff.c:5521
msgid "<file>"
msgstr "<文件>"
#: diff.c:5522
msgid "Output to a specific file"
msgstr "输出到一个指定的文件"
#: diff.c:6177
msgid "inexact rename detection was skipped due to too many files."
msgstr "因为文件太多,略过不严格的重命名检查。"
#: diff.c:6180
msgid "only found copies from modified paths due to too many files."
msgstr "因为文件太多,只在修改的路径中查找拷贝。"
#: diff.c:6183
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
#: dir.c:537
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
#: dir.c:926
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "不能将 %s 用作排除文件"
#: dir.c:1843
#, c-format
msgid "could not open directory '%s'"
msgstr "不能打开目录 '%s'"
#: dir.c:2085
msgid "failed to get kernel name and information"
msgstr "无法获得内核名称和信息"
#: dir.c:2209
msgid "untracked cache is disabled on this system or location"
msgstr "缓存未跟踪文件在本系统或位置中被禁用"
#: dir.c:3013
#, c-format
msgid "index file corrupt in repo %s"
msgstr "仓库 %s 中的索引文件损坏"
#: dir.c:3058 dir.c:3063
#, c-format
msgid "could not create directories for %s"
msgstr "不能为 %s 创建目录"
#: dir.c:3092
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
#: editor.c:73
#, c-format
msgid "hint: Waiting for your editor to close the file...%c"
msgstr "提示:等待您的编辑器关闭文件...%c"
#: entry.c:178
msgid "Filtering content"
msgstr "过滤内容"
#: entry.c:476
#, c-format
msgid "could not stat file '%s'"
msgstr "不能对文件 '%s' 调用 stat"
#: environment.c:150
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "错误的 git 名字空间路径 \"%s\""
#: environment.c:332
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "不能设置 GIT_DIR 为 '%s'"
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
msgstr "执行 %s 的参数太多"
#: fetch-object.c:17
msgid "Remote with no URL"
msgstr "远程未设置 URL"
#: fetch-pack.c:151
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack应为 shallow 列表"
#: fetch-pack.c:154
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack在浅克隆列表之后期望一个 flush 包"
#: fetch-pack.c:165
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack期望 ACK/NAK却得到 flush 包"
#: fetch-pack.c:185
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack应为 ACK/NAK却得到 '%s'"
#: fetch-pack.c:196
msgid "unable to write to remote"
msgstr "无法写到远程"
#: fetch-pack.c:258
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"
#: fetch-pack.c:360 fetch-pack.c:1284
#, c-format
msgid "invalid shallow line: %s"
msgstr "无效的 shallow 信息:%s"
#: fetch-pack.c:366 fetch-pack.c:1290
#, c-format
msgid "invalid unshallow line: %s"
msgstr "无效的 unshallow 信息:%s"
#: fetch-pack.c:368 fetch-pack.c:1292
#, c-format
msgid "object not found: %s"
msgstr "对象未找到:%s"
#: fetch-pack.c:371 fetch-pack.c:1295
#, c-format
msgid "error in object: %s"
msgstr "对象中出错:%s"
#: fetch-pack.c:373 fetch-pack.c:1297
#, c-format
msgid "no shallow found: %s"
msgstr "未发现 shallow%s"
#: fetch-pack.c:376 fetch-pack.c:1301
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "应为 shallow/unshallow却得到 %s"
#: fetch-pack.c:417
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
#: fetch-pack.c:434
#, c-format
msgid "invalid commit %s"
msgstr "无效提交 %s"
#: fetch-pack.c:465
msgid "giving up"
msgstr "放弃"
#: fetch-pack.c:477 progress.c:277
msgid "done"
msgstr "完成"
#: fetch-pack.c:489
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
#: fetch-pack.c:535
#, c-format
msgid "Marking %s as complete"
msgstr "标记 %s 为完成"
#: fetch-pack.c:744
#, c-format
msgid "already have %s (%s)"
msgstr "已经有 %s%s"
#: fetch-pack.c:783
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack无法派生 sideband 多路输出"
#: fetch-pack.c:791
msgid "protocol error: bad pack header"
msgstr "协议错误:坏的包头"
#: fetch-pack.c:859
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack无法派生进程 %s"
#: fetch-pack.c:875
#, c-format
msgid "%s failed"
msgstr "%s 失败"
#: fetch-pack.c:877
msgid "error in sideband demultiplexer"
msgstr "sideband 多路输出出错"
#: fetch-pack.c:908
#, c-format
msgid "Server version is %.*s"
msgstr "服务器版本 %.*s"
#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
#, c-format
msgid "Server supports %s"
msgstr "服务器支持 %s"
#: fetch-pack.c:915
msgid "Server does not support shallow clients"
msgstr "服务器不支持 shalllow 客户端"
#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "服务器不支持 --shallow-since"
#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "服务器不支持 --shallow-exclude"
#: fetch-pack.c:984
msgid "Server does not support --deepen"
msgstr "服务器不支持 --deepen"
#: fetch-pack.c:1001
msgid "no common commits"
msgstr "没有共同的提交"
#: fetch-pack.c:1013 fetch-pack.c:1462
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack获取失败。"
#: fetch-pack.c:1151
msgid "Server does not support shallow requests"
msgstr "服务器不支持 shalllow 请求"
#: fetch-pack.c:1157
msgid "Server supports filter"
msgstr "服务器支持 filter"
#: fetch-pack.c:1184
msgid "unable to write request to remote"
msgstr "无法将请求写到远程"
#: fetch-pack.c:1202
#, c-format
msgid "error reading section header '%s'"
msgstr "读取节标题 '%s' 出错"
#: fetch-pack.c:1208
#, c-format
msgid "expected '%s', received '%s'"
msgstr "预期 '%s',得到 '%s'"
#: fetch-pack.c:1247
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "意外的确认行:'%s'"
#: fetch-pack.c:1252
#, c-format
msgid "error processing acks: %d"
msgstr "处理 ack 出错:%d"
#: fetch-pack.c:1262
msgid "expected packfile to be sent after 'ready'"
msgstr "预期在 'ready' 之后发送 packfile"
#: fetch-pack.c:1264
msgid "expected no other sections to be sent after no 'ready'"
msgstr "在没有 'ready' 不应该发送其它小节"
#: fetch-pack.c:1306
#, c-format
msgid "error processing shallow info: %d"
msgstr "处理浅克隆信息出错:%d"
#: fetch-pack.c:1353
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "预期 wanted-ref得到 '%s'"
#: fetch-pack.c:1358
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "意外的 wanted-ref'%s'"
#: fetch-pack.c:1363
#, c-format
msgid "error processing wanted refs: %d"
msgstr "处理要获取的引用出错:%d"
#: fetch-pack.c:1689
msgid "no matching remote head"
msgstr "没有匹配的远程分支"
#: fetch-pack.c:1712 builtin/clone.c:686
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必需的对象"
#: fetch-pack.c:1739
#, c-format
msgid "no such remote ref %s"
msgstr "没有这样的远程引用 %s"
#: fetch-pack.c:1742
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "服务器不允许请求未公开的对象 %s"
#: gpg-interface.c:321
msgid "gpg failed to sign the data"
msgstr "gpg 无法为数据签名"
#: gpg-interface.c:347
msgid "could not create temporary file"
msgstr "不能创建临时文件"
#: gpg-interface.c:350
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "无法将分离式签名写入 '%s'"
#: graph.c:97
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
#: grep.c:2117
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s':无法读取 %s"
#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "对 '%s' 调用 stat 失败"
#: grep.c:2145
#, c-format
msgid "'%s': short read"
msgstr "'%s':读取不完整"
#: help.c:23
msgid "start a working area (see also: git help tutorial)"
msgstr "开始一个工作区参见git help tutorial"
#: help.c:24
msgid "work on the current change (see also: git help everyday)"
msgstr "在当前变更上工作参见git help everyday"
#: help.c:25
msgid "examine the history and state (see also: git help revisions)"
msgstr "检查历史和状态参见git help revisions"
#: help.c:26
msgid "grow, mark and tweak your common history"
msgstr "扩展、标记和调校您的历史记录"
#: help.c:27
msgid "collaborate (see also: git help workflows)"
msgstr "协同参见git help workflows"
#: help.c:31
msgid "Main Porcelain Commands"
msgstr "主要的上层命令"
#: help.c:32
msgid "Ancillary Commands / Manipulators"
msgstr "辅助命令/操作者"
#: help.c:33
msgid "Ancillary Commands / Interrogators"
msgstr "辅助命令/询问者"
#: help.c:34
msgid "Interacting with Others"
msgstr "与其它系统交互"
#: help.c:35
msgid "Low-level Commands / Manipulators"
msgstr "低级命令/操作者"
#: help.c:36
msgid "Low-level Commands / Interrogators"
msgstr "低级命令/询问者"
#: help.c:37
msgid "Low-level Commands / Synching Repositories"
msgstr "低级命令/同步仓库"
#: help.c:38
msgid "Low-level Commands / Internal Helpers"
msgstr "低级命令/内部助手"
#: help.c:298
#, c-format
msgid "available git commands in '%s'"
msgstr "在 '%s' 下可用的 git 命令"
#: help.c:305
msgid "git commands available from elsewhere on your $PATH"
msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
#: help.c:314
msgid "These are common Git commands used in various situations:"
msgstr "这些是各种场合常见的 Git 命令:"
#: help.c:363 git.c:98
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "不支持的命令列表类型 '%s'"
#: help.c:403
msgid "The common Git guides are:"
msgstr "最常用的 Git 向导有:"
#: help.c:512
msgid "See 'git help <command>' to read about a specific subcommand"
msgstr "执行 'git help <command>' 来查看特定子命令"
#: help.c:517
msgid "External commands"
msgstr "外部命令"
#: help.c:532
msgid "Command aliases"
msgstr "命令别名"
#: help.c:596
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
"'%s' 像是一个 git 命令,但却无法运行。\n"
"可能是 git-%s 受损?"
#: help.c:655
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "唉呀,您的系统中未发现 Git 命令。"
#: help.c:677
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。"
#: help.c:682
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr "假定你想要的是 '%s' 并继续。"
#: help.c:687
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。"
#: help.c:695
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git'%s' 不是一个 git 命令。参见 'git --help'。"
#: help.c:699
msgid ""
"\n"
"The most similar command is"
msgid_plural ""
"\n"
"The most similar commands are"
msgstr[0] ""
"\n"
"最相似的命令是"
msgstr[1] ""
"\n"
"最相似的命令是"
#: help.c:714
msgid "git version [<options>]"
msgstr "git version [<选项>]"
#: help.c:782
#, c-format
msgid "%s: %s - %s"
msgstr "%s%s - %s"
#: help.c:786
msgid ""
"\n"
"Did you mean this?"
msgid_plural ""
"\n"
"Did you mean one of these?"
msgstr[0] ""
"\n"
"您指的是这个么?"
msgstr[1] ""
"\n"
"您指的是这其中的某一个么?"
#: ident.c:349
msgid ""
"\n"
"*** Please tell me who you are.\n"
"\n"
"Run\n"
"\n"
" git config --global user.email \"you@example.com\"\n"
" git config --global user.name \"Your Name\"\n"
"\n"
"to set your account's default identity.\n"
"Omit --global to set the identity only in this repository.\n"
"\n"
msgstr ""
"\n"
"*** 请告诉我你是谁。\n"
"\n"
"运行\n"
"\n"
" git config --global user.email \"you@example.com\"\n"
" git config --global user.name \"Your Name\"\n"
"\n"
"来设置您账号的缺省身份标识。\n"
"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
#: ident.c:379
msgid "no email was given and auto-detection is disabled"
msgstr "未提供邮件地址且自动探测被禁用"
#: ident.c:384
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "无法自动探测邮件地址(得到 '%s'"
#: ident.c:401
msgid "no name was given and auto-detection is disabled"
msgstr "未提供姓名且自动探测被禁用"
#: ident.c:407
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "无法自动探测姓名(得到 '%s'"
#: ident.c:415
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "不允许空的姓名(对于 <%s>"
#: ident.c:421
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "姓名中仅包含禁用字符:%s"
#: ident.c:436 builtin/commit.c:611
#, c-format
msgid "invalid date format: %s"
msgstr "无效的日期格式:%s"
#: list-objects.c:129
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性,但不是一个树对象"
#: list-objects.c:142
#, c-format
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性,但不是一个数据对象"
#: list-objects.c:378
#, c-format
msgid "unable to load root tree for commit %s"
msgstr "无法为提交 %s 加载根树"
#: list-objects-filter-options.c:36
msgid "multiple filter-specs cannot be combined"
msgstr "不能混用多种过滤规格"
#: list-objects-filter-options.c:58
msgid "expected 'tree:<depth>'"
msgstr "期望 'tree:<深度>'"
#: list-objects-filter-options.c:84
msgid "sparse:path filters support has been dropped"
msgstr "sparse:path 过滤器支持已被删除"
#: list-objects-filter-options.c:94
#, c-format
msgid "invalid filter-spec '%s'"
msgstr "无效的过滤器表达式 '%s'"
#: list-objects-filter-options.c:158
msgid "cannot change partial clone promisor remote"
msgstr "无法修改部分克隆的 promisor 远程仓库"
#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
"\n"
"Another git process seems to be running in this repository, e.g.\n"
"an editor opened by 'git commit'. Please make sure all processes\n"
"are terminated then try again. If it still fails, a git process\n"
"may have crashed in this repository earlier:\n"
"remove the file manually to continue."
msgstr ""
"无法创建 '%s.lock'%s。\n"
"\n"
"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
"可能之前有一个 git 进程在这个仓库中异常退出:\n"
"手动删除这个文件再继续。"
#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "不能创建 '%s.lock'%s"
#: merge.c:41
msgid "failed to read the cache"
msgstr "读取缓存失败"
#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
#: builtin/stash.c:264
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
#: merge-recursive.c:322
msgid "(bad commit)\n"
msgstr "(坏提交)\n"
#: merge-recursive.c:345
#, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。"
#: merge-recursive.c:354
#, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。"
#: merge-recursive.c:437
msgid "error building trees"
msgstr "创建树出错"
#: merge-recursive.c:863
#, c-format
msgid "failed to create path '%s'%s"
msgstr "创建路径 '%s'%s 失败"
#: merge-recursive.c:874
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "删除 %s 以便为子目录留出空间\n"
#: merge-recursive.c:888 merge-recursive.c:907
msgid ": perhaps a D/F conflict?"
msgstr ":可能是一个目录/文件冲突?"
#: merge-recursive.c:897
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
#: merge-recursive.c:938 builtin/cat-file.c:40
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能读取对象 %s '%s'"
#: merge-recursive.c:941
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数据对象"
#: merge-recursive.c:965
#, c-format
msgid "failed to open '%s': %s"
msgstr "打开 '%s' 失败:%s"
#: merge-recursive.c:976
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "创建符号链接 '%s' 失败:%s"
#: merge-recursive.c:981
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何处理 %06o %s '%s'"
#: merge-recursive.c:1177
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "无法合并子模组 %s (没有检出)"
#: merge-recursive.c:1184
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "无法合并子模组 %s提交不存在"
#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "无法合并子模组 %s (提交未跟随合并基线)"
#: merge-recursive.c:1199 merge-recursive.c:1211
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "子模组 %s 快进到如下提交:"
#: merge-recursive.c:1202 merge-recursive.c:1214
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "快进子模组 %s"
#: merge-recursive.c:1237
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr "无法合并子模组 %s (没发现合并跟随的提交)"
#: merge-recursive.c:1241
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "无法合并子模组 %s非快进"
#: merge-recursive.c:1242
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "找到子模组的一个可能的合并方案:\n"
#: merge-recursive.c:1245
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
"by using:\n"
"\n"
" git update-index --cacheinfo 160000 %s \"%s\"\n"
"\n"
"which will accept this suggestion.\n"
msgstr ""
"如果这个正确,将其添加到索引,例如使用命令:\n"
"\n"
" git update-index --cacheinfo 160000 %s \"%s\"\n"
"\n"
"以接受此建议。\n"
#: merge-recursive.c:1254
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "无法合并子模组 %s (发现多个合并)"
#: merge-recursive.c:1327
msgid "Failed to execute internal merge"
msgstr "无法执行内部合并"
#: merge-recursive.c:1332
#, c-format
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"
#: merge-recursive.c:1364
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"
#: merge-recursive.c:1387
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。"
#: merge-recursive.c:1459
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本被保留。"
#: merge-recursive.c:1464
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree."
msgstr ""
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本被保留。"
#: merge-recursive.c:1471
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本保留在 %8$s 中。"
#: merge-recursive.c:1476
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree at %s."
msgstr ""
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本保留在 %9$s 中。"
#: merge-recursive.c:1511
msgid "rename"
msgstr "重命名"
#: merge-recursive.c:1511
msgid "renamed"
msgstr "重命名"
#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "拒绝丢失脏文件 '%s'"
#: merge-recursive.c:1601
#, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。"
#: merge-recursive.c:1659
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
#: merge-recursive.c:1690
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
#: merge-recursive.c:1695
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s"
#: merge-recursive.c:1714
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
#: merge-recursive.c:1719
msgid " (left unresolved)"
msgstr "(留下未解决)"
#: merge-recursive.c:1828
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s在 %6$s 中重命名 %4$s->"
"%5$s"
#: merge-recursive.c:2035
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
"directory %s was renamed to multiple other directories, with no destination "
"getting a majority of the files."
msgstr ""
"冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个"
"其它目录,没有目录包含大部分文件。"
#: merge-recursive.c:2067
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"implicit directory rename(s) putting the following path(s) there: %s."
msgstr ""
"冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s将以下路径放"
"在:%s。"
#: merge-recursive.c:2077
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"implicit directory renames tried to put these paths there: %s"
msgstr ""
"冲突(隐式目录重命名):无法映射一个以上路径到 %s隐式目录重命名尝试将这些路"
"径放置于此:%s"
#: merge-recursive.c:2169
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
">%s in %s"
msgstr ""
"冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s在 %6$s 中重命名目录 "
"%4$s->%5$s"
#: merge-recursive.c:2413
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr "警告:避免应用 %s -> %s 的重命名到 %s因为 %s 本身已被重命名。"
#: merge-recursive.c:2938
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
#: merge-recursive.c:2941
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个数据对象"
#: merge-recursive.c:3005
msgid "modify"
msgstr "修改"
#: merge-recursive.c:3005
msgid "modified"
msgstr "修改"
#: merge-recursive.c:3017
msgid "content"
msgstr "内容"
#: merge-recursive.c:3021
msgid "add/add"
msgstr "添加/添加"
#: merge-recursive.c:3044
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s已经做过相同合并"
#: merge-recursive.c:3066 git-submodule.sh:937
msgid "submodule"
msgstr "子模组"
#: merge-recursive.c:3067
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突(%s合并冲突于 %s"
#: merge-recursive.c:3097
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"
#: merge-recursive.c:3179
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"moving it to %s."
msgstr ""
"路径已更新:%s 添加到 %s位于一个被重命名到 %s 的目录中,将其移动到 %s。"
#: merge-recursive.c:3182
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"in %s, suggesting it should perhaps be moved to %s."
msgstr ""
"冲突(文件位置):%s 添加到 %s位于一个被重命名为 %s 的目录中,建议将其移动"
"到 %s。"
#: merge-recursive.c:3186
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"%s; moving it to %s."
msgstr ""
"路径已更新:%1$s 重命名为 %3$s 中的 %2$s而该目录被重命名到 %4$s 中,将其移"
"动到 %5$s。"
#: merge-recursive.c:3189
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"was renamed in %s, suggesting it should perhaps be moved to %s."
msgstr ""
"冲突(文件位置):%1$s 重命名为 %3$s 中的 %2$s而该目录被重命名到 %4$s 中,"
"建议将其移动到 %5$s。"
#: merge-recursive.c:3303
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
#: merge-recursive.c:3326
msgid "file/directory"
msgstr "文件/目录"
#: merge-recursive.c:3331
msgid "directory/file"
msgstr "目录/文件"
#: merge-recursive.c:3338
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "冲突(%1$s在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
#: merge-recursive.c:3347
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
#: merge-recursive.c:3356
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "冲突add/add合并冲突于 %s"
#: merge-recursive.c:3394
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
" %s"
msgstr ""
"您对下列文件的本地修改将被合并操作覆盖:\n"
" %s"
#: merge-recursive.c:3405
msgid "Already up to date!"
msgstr "已经是最新的!"
#: merge-recursive.c:3414
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
#: merge-recursive.c:3513
msgid "Merging:"
msgstr "合并:"
#: merge-recursive.c:3526
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先:"
msgstr[1] "发现 %u 个共同祖先:"
#: merge-recursive.c:3565
msgid "merge returned no commit"
msgstr "合并未返回提交"
#: merge-recursive.c:3631
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
msgid "Unable to write index."
msgstr "不能写入索引。"
#: midx.c:69
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "多包索引文件 %s 太小"
#: midx.c:85
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
#: midx.c:90
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index 版本 %d 不能被识别"
#: midx.c:95
#, c-format
msgid "hash version %u does not match"
msgstr "散列版本 %u 不匹配"
#: midx.c:109
msgid "invalid chunk offset (too large)"
msgstr "无效的块偏移(太大)"
#: midx.c:133
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr "终止多包索引块 id 出现时间早于预期"
#: midx.c:146
msgid "multi-pack-index missing required pack-name chunk"
msgstr "多包索引缺少必需的包名块"
#: midx.c:148
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "多包索引缺少必需的对象 ID 扇出块"
#: midx.c:150
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "多包索引缺少必需的对象 ID 查询块"
#: midx.c:152
msgid "multi-pack-index missing required object offsets chunk"
msgstr "多包索引缺少必需的对象偏移块"
#: midx.c:166
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "多包索引包名无序:'%s' 在 '%s' 之前"
#: midx.c:211
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "错的 pack-int-id%u共有 %u 个包)"
#: midx.c:261
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "多包索引存储一个64位偏移但是 off_t 太小"
#: midx.c:289
msgid "error preparing packfile from multi-pack-index"
msgstr "从多包索引准备 packfile 出错"
#: midx.c:470
#, c-format
msgid "failed to add packfile '%s'"
msgstr "添加包文件 '%s' 失败"
#: midx.c:476
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "打开包索引 '%s' 失败"
#: midx.c:536
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "在包文件中定位对象 %d 失败"
#: midx.c:865
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "没有看到要丢弃的包文件 %s"
#: midx.c:1036
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "清理位于 %s 的多包索引失败"
#: midx.c:1091
msgid "Looking for referenced packfiles"
msgstr "正在查找引用的包文件"
#: midx.c:1106
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "对象 ID 扇出无序fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
#: midx.c:1110
msgid "Verifying OID order in MIDX"
msgstr "正在校验 MIDX 中的对象 ID 顺序"
#: midx.c:1119
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "对象 ID 查询无序oid[%d] = %s >= %s = oid[%d]"
#: midx.c:1138
msgid "Sorting objects by packfile"
msgstr "通过包文件为对象排序"
#: midx.c:1144
msgid "Verifying object offsets"
msgstr "校验对象偏移"
#: midx.c:1160
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "为 oid[%d] = %s 加载包条目失败"
#: midx.c:1166
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "为包文件 %s 加载包索引失败"
#: midx.c:1175
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "oid[%d] = %s 错误的对象偏移:%<PRIx64> != %<PRIx64>"
#: midx.c:1350
msgid "could not start pack-objects"
msgstr "不能开始 pack-objects"
#: midx.c:1369
msgid "could not finish pack-objects"
msgstr "不能结束 pack-objects"
#: name-hash.c:532
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "不能创建 lazy_dir 线程:%s"
#: name-hash.c:554
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "不能创建 lazy_name 线程:%s"
#: name-hash.c:560
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "不能加入 lasy_name 线程:%s"
#: notes-merge.c:277
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
"commit/abort the previous merge before you start a new notes merge."
msgstr ""
"您的前一次注释合并尚未结束(存在 %s。\n"
"在开始一个新的注释合并之前,请使用 'git notes merge --commit' 或者 'git "
"notes merge --abort' 来提交/终止前一次合并。"
#: notes-merge.c:284
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "您尚未结束注释合并(存在 %s。"
#: notes-utils.c:46
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "不能提交未初始化/未引用的注解树"
#: notes-utils.c:105
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "坏的 notes.rewriteMode 值:'%s'"
#: notes-utils.c:115
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr "拒绝向 %s在 refs/notes/ 之外)写入注解"
#. TRANSLATORS: The first %s is the name of
#. the environment variable, the second %s is
#. its value.
#.
#: notes-utils.c:145
#, c-format
msgid "Bad %s value: '%s'"
msgstr "坏的 %s 值:'%s'"
#: object.c:54
#, c-format
msgid "invalid object type \"%s\""
msgstr "无效的对象类型 \"%s\""
#: object.c:174
#, c-format
msgid "object %s is a %s, not a %s"
msgstr "对象 %s 是一个 %s不是一个 %s"
#: object.c:234
#, c-format
msgid "object %s has unknown type id %d"
msgstr "对象 %s 有未知的类型 id %d"
#: object.c:247
#, c-format
msgid "unable to parse object: %s"
msgstr "不能解析对象:%s"
#: object.c:267 object.c:278
#, c-format
msgid "hash mismatch %s"
msgstr "哈希值与 %s 不匹配"
#: packfile.c:648
msgid "offset before end of packfile (broken .idx?)"
msgstr "偏移量在包文件结束之前(损坏的 .idx"
#: packfile.c:1899
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
#: packfile.c:1903
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
#: parse-options.c:38
#, c-format
msgid "%s requires a value"
msgstr "%s 需要一个值"
#: parse-options.c:73
#, c-format
msgid "%s is incompatible with %s"
msgstr "%s 与 %s 不兼容"
#: parse-options.c:78
#, c-format
msgid "%s : incompatible with something else"
msgstr "%s和其它的不兼容"
#: parse-options.c:92 parse-options.c:96 parse-options.c:319
#, c-format
msgid "%s takes no value"
msgstr "%s 不取值"
#: parse-options.c:94
#, c-format
msgid "%s isn't available"
msgstr "%s 不可用"
#: parse-options.c:219
#, c-format
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
#: parse-options.c:389
#, c-format
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
msgstr "有歧义的选项:%s可以是 --%s%s 或 --%s%s"
#: parse-options.c:423 parse-options.c:431
#, c-format
msgid "did you mean `--%s` (with two dashes ?)"
msgstr "你的意思是 `--%s`(有两个短线?)"
#: parse-options.c:859
#, c-format
msgid "unknown option `%s'"
msgstr "未知选项 `%s'"
#: parse-options.c:861
#, c-format
msgid "unknown switch `%c'"
msgstr "未知开关 `%c'"
#: parse-options.c:863
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "字符串中未知的非 ascii 字符选项:`%s'"
#: parse-options.c:887
msgid "..."
msgstr "..."
#: parse-options.c:906
#, c-format
msgid "usage: %s"
msgstr "用法:%s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
#: parse-options.c:912
#, c-format
msgid " or: %s"
msgstr " 或:%s"
# 译者:为保证在输出中对齐,注意调整句中空格!
#: parse-options.c:915
#, c-format
msgid " %s"
msgstr " %s"
#: parse-options.c:954
msgid "-NUM"
msgstr "-数字"
#: parse-options.c:968
#, c-format
msgid "alias of --%s"
msgstr "--%s 的别名"
#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
msgid "option `%s' expects a numerical value"
msgstr "选项 `%s' 期望一个数字值"
#: parse-options-cb.c:41
#, c-format
msgid "malformed expiration date '%s'"
msgstr "格式错误的到期时间:'%s'"
#: parse-options-cb.c:54
#, c-format
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
#: parse-options-cb.c:130 parse-options-cb.c:147
#, c-format
msgid "malformed object name '%s'"
msgstr "格式错误的对象名 '%s'"
#: path.c:897
#, c-format
msgid "Could not make %s writable by group"
msgstr "不能设置 %s 为组可写"
#: pathspec.c:128
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
#: pathspec.c:146
msgid "Only one 'attr:' specification is allowed."
msgstr "只允许一个 'attr:' 规格。"
#: pathspec.c:149
msgid "attr spec must not be empty"
msgstr "属性规格不能为空"
#: pathspec.c:192
#, c-format
msgid "invalid attribute name %s"
msgstr "无效的属性名 %s"
#: pathspec.c:257
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
#: pathspec.c:264
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
#: pathspec.c:304
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "路径规格包含无效的神奇前缀"
#: pathspec.c:325
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
#: pathspec.c:330
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
#: pathspec.c:368
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
#: pathspec.c:427
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s'literal' 和 'glob' 不兼容"
#: pathspec.c:440
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s'%s' 在仓库之外"
#: pathspec.c:514
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s'(助记符:'%c'"
#: pathspec.c:524
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s路径规格神奇前缀不被此命令支持%s"
#: pathspec.c:591
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "路径规格 '%s' 位于符号链接中"
#: pkt-line.c:92
msgid "unable to write flush packet"
msgstr "无法写 flush 包"
#: pkt-line.c:99
msgid "unable to write delim packet"
msgstr "无法写 delim 包"
#: pkt-line.c:106
msgid "flush packet write failed"
msgstr "flush 包写错误"
#: pkt-line.c:146 pkt-line.c:232
msgid "protocol error: impossibly long line"
msgstr "协议错误:不可能的长行"
#: pkt-line.c:162 pkt-line.c:164
msgid "packet write with format failed"
msgstr "格式化包写入错误"
#: pkt-line.c:196
msgid "packet write failed - data exceeds max packet size"
msgstr "写数据包失败:数据超过了包的最大长度"
#: pkt-line.c:203 pkt-line.c:210
msgid "packet write failed"
msgstr "数据包写入失败"
#: pkt-line.c:295
msgid "read error"
msgstr "读取错误"
#: pkt-line.c:303
msgid "the remote end hung up unexpectedly"
msgstr "远端意外挂断了"
#: pkt-line.c:331
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr "协议错误:错误的行长度字符串:%.4s"
#: pkt-line.c:341 pkt-line.c:346
#, c-format
msgid "protocol error: bad line length %d"
msgstr "协议错误:错误的行长度 %d"
#: pkt-line.c:362
#, c-format
msgid "remote error: %s"
msgstr "远程错误:%s"
#: preload-index.c:119
msgid "Refreshing index"
msgstr "正在刷新索引"
#: preload-index.c:138
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "无法创建线程 lstat%s"
#: pretty.c:966
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
#: range-diff.c:70
msgid "could not start `log`"
msgstr "不能启动 `log`"
#: range-diff.c:72
msgid "could not read `log` output"
msgstr "不能读取 `log` 的输出"
#: range-diff.c:91 sequencer.c:5021
#, c-format
msgid "could not parse commit '%s'"
msgstr "不能解析提交 '%s'"
#: range-diff.c:117
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "无法解析 git 头 '%.*s'"
#: range-diff.c:274
msgid "failed to generate diff"
msgstr "生成 diff 失败"
#: range-diff.c:506 range-diff.c:508
#, c-format
msgid "could not parse log for '%s'"
msgstr "不能解析 '%s' 的日志"
#: read-cache.c:680
#, c-format
msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "将不会添加文件别名 '%s''%s' 已经存在于索引中)"
#: read-cache.c:696
msgid "cannot create an empty blob in the object database"
msgstr "不能在对象数据库中创建空的数据对象"
#: read-cache.c:718
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr "%s只能添加常规文件、符号链接或 git 目录"
#: read-cache.c:723
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' 没有检出一个提交"
#: read-cache.c:775
#, c-format
msgid "unable to index file '%s'"
msgstr "无法索引文件 '%s'"
#: read-cache.c:794
#, c-format
msgid "unable to add '%s' to index"
msgstr "无法在索引中添加 '%s'"
#: read-cache.c:805
#, c-format
msgid "unable to stat '%s'"
msgstr "无法对 %s 执行 stat"
#: read-cache.c:1314
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' 看起来既是文件又是目录"
#: read-cache.c:1499
msgid "Refresh index"
msgstr "刷新索引"
#: read-cache.c:1613
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
"设置了 index.version但是取值无效。\n"
"使用版本 %i"
#: read-cache.c:1623
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
"设置了 GIT_INDEX_VERSION但是取值无效。\n"
"使用版本 %i"
#: read-cache.c:1679
#, c-format
msgid "bad signature 0x%08x"
msgstr "坏的签名 0x%08x"
#: read-cache.c:1682
#, c-format
msgid "bad index version %d"
msgstr "坏的索引版本 %d"
#: read-cache.c:1691
msgid "bad index file sha1 signature"
msgstr "坏的索引文件 sha1 签名"
#: read-cache.c:1721
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "索引使用不被支持的 %.4s 扩展"
#
#: read-cache.c:1723
#, c-format
msgid "ignoring %.4s extension"
msgstr "忽略 %.4s 扩展"
#: read-cache.c:1760
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "未知的索引条目格式 0x%08x"
#: read-cache.c:1776
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "索引中靠近路径 '%s' 有错误的名称字段"
#: read-cache.c:1833
msgid "unordered stage entries in index"
msgstr "索引中有未排序的暂存条目"
#: read-cache.c:1836
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "合并文件 '%s' 有多个暂存条目"
#: read-cache.c:1839
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "'%s' 的未排序暂存条目"
#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
msgid "index file corrupt"
msgstr "索引文件损坏"
#: read-cache.c:2087
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "无法创建 load_cache_entries 线程:%s"
#: read-cache.c:2100
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "无法加入 load_cache_entries 线程:%s"
#: read-cache.c:2133
#, c-format
msgid "%s: index file open failed"
msgstr "%s打开索引文件失败"
#: read-cache.c:2137
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s不能对打开的索引执行 stat 操作"
#: read-cache.c:2141
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s索引文件比预期的小"
#: read-cache.c:2145
#, c-format
msgid "%s: unable to map index file"
msgstr "%s无法对索引文件执行 map 操作"
#: read-cache.c:2187
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "无法创建 load_index_extensions 线程:%s"
#: read-cache.c:2214
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "无法加入 load_index_extensions 线程:%s"
#: read-cache.c:2246
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "无法刷新共享索引 '%s'"
#: read-cache.c:2293
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "损坏的索引,期望在 %2$s 中的 %1$s得到 %3$s"
#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114
#, c-format
msgid "could not close '%s'"
msgstr "不能关闭 '%s'"
#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
#, c-format
msgid "could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
#: read-cache.c:3105
#, c-format
msgid "unable to open git dir: %s"
msgstr "不能打开 git 目录:%s"
#: read-cache.c:3117
#, c-format
msgid "unable to unlink: %s"
msgstr "无法删除:%s"
#: read-cache.c:3142
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "不能修复 '%s' 的权限位"
#: read-cache.c:3291
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s不能落到暂存区 #0"
#: rebase-interactive.c:26
#, c-format
msgid ""
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
#: rebase-interactive.c:35
msgid ""
"\n"
"Commands:\n"
"p, pick <commit> = use commit\n"
"r, reword <commit> = use commit, but edit the commit message\n"
"e, edit <commit> = use commit, but stop for amending\n"
"s, squash <commit> = use commit, but meld into previous commit\n"
"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
"x, exec <command> = run command (the rest of the line) using shell\n"
"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
"d, drop <commit> = remove commit\n"
"l, label <label> = label current HEAD with a name\n"
"t, reset <label> = reset HEAD to a label\n"
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
". create a merge commit using the original merge commit's\n"
". message (or the oneline, if no original merge commit was\n"
". specified). Use -c <commit> to reword the commit message.\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
"\n"
"命令:\n"
"p, pick <提交> = 使用提交\n"
"r, reword <提交> = 使用提交,但修改提交说明\n"
"e, edit <提交> = 使用提交,进入 shell 以便进行提交修补\n"
"s, squash <提交> = 使用提交,但融合到前一个提交\n"
"f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
"x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
"b, break = 在此处停止(使用 'git rebase --continue' 继续变基)\n"
"d, drop <提交> = 删除提交\n"
"l, label <label> = 为当前 HEAD 打上标记\n"
"t, reset <label> = 重置 HEAD 到该标记\n"
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
". -c <提交> 可以编辑提交说明。\n"
"\n"
"可以对这些行重新排序,将从上至下执行。\n"
#: rebase-interactive.c:56
#, c-format
msgid "Rebase %s onto %s (%d command)"
msgid_plural "Rebase %s onto %s (%d commands)"
msgstr[0] "变基 %s 到 %s%d 个提交)"
msgstr[1] "变基 %s 到 %s%d 个提交)"
#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
msgstr ""
"\n"
"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
msgstr ""
"\n"
"如果您在这里删除一行,对应的提交将会丢失。\n"
#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
"To continue rebase after editing, run:\n"
" git rebase --continue\n"
"\n"
msgstr ""
"\n"
"您正在修改进行中的交互式变基待办列表。若要在编辑结束后继续变基,\n"
"请执行:\n"
" git rebase --continue\n"
"\n"
#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
"\n"
"然而,如果您删除全部内容,变基操作将会终止。\n"
"\n"
#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
msgid "Note that empty commits are commented out"
msgstr "注意空提交已被注释掉"
#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
#, c-format
msgid "could not write '%s'"
msgstr "不能写入 '%s'"
#: rebase-interactive.c:108
#, c-format
msgid "could not copy '%s' to '%s'."
msgstr "不能拷贝 '%s' 至 '%s'。"
#: rebase-interactive.c:173
#, c-format
msgid ""
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):\n"
msgstr ""
"警告:一些提交可能被意外丢弃。\n"
"丢弃的提交(从新到旧):\n"
#: rebase-interactive.c:180
#, c-format
msgid ""
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
"\n"
"Use 'git config rebase.missingCommitsCheck' to change the level of "
"warnings.\n"
"The possible behaviours are: ignore, warn, error.\n"
"\n"
msgstr ""
"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
"\n"
"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
"可选值有ignore、warn、error。\n"
"\n"
#: refs.c:262
#, c-format
msgid "%s does not point to a valid object!"
msgstr "%s 没有指向一个有效的对象!"
#: refs.c:667
#, c-format
msgid "ignoring dangling symref %s"
msgstr "忽略悬空符号引用 %s"
#: refs.c:669 ref-filter.c:2092
#, c-format
msgid "ignoring broken ref %s"
msgstr "忽略损坏的引用 %s"
#: refs.c:804
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr "无法为写入打开 '%s'%s"
#: refs.c:814 refs.c:865
#, c-format
msgid "could not read ref '%s'"
msgstr "无法读取引用 '%s'"
#: refs.c:820
#, c-format
msgid "ref '%s' already exists"
msgstr "引用 '%s' 已经存在"
#: refs.c:825
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr "写入 '%s' 时意外的对象 ID"
#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "不能写入 '%s'"
#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
#: builtin/rebase.c:1003
#, c-format
msgid "could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
#: refs.c:867
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr "删除 '%s' 时意外的对象 ID"
#: refs.c:998
#, c-format
msgid "log for ref %s has gap after %s"
msgstr "引用 %s 的日志在 %s 之后有缺口"
#: refs.c:1004
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr "引用 %s 的日志意外终止于 %s "
#: refs.c:1063
#, c-format
msgid "log for %s is empty"
msgstr "%s 的日志为空"
#: refs.c:1155
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr "拒绝更新有错误名称 '%s' 的引用"
#: refs.c:1231
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr "对引用 '%s' 执行 update_ref 失败:%s"
#: refs.c:2012
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr "不允许对引用 '%s' 多次更新"
#: refs.c:2044
msgid "ref updates forbidden inside quarantine environment"
msgstr "在隔离环境中禁止更新引用"
#: refs.c:2140 refs.c:2170
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr "'%s' 已存在,无法创建 '%s'"
#: refs.c:2146 refs.c:2181
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr "无法同时处理 '%s' 和 '%s'"
#: refs/files-backend.c:1234
#, c-format
msgid "could not remove reference %s"
msgstr "无法删除引用 %s"
#: refs/files-backend.c:1248 refs/packed-backend.c:1532
#: refs/packed-backend.c:1542
#, c-format
msgid "could not delete reference %s: %s"
msgstr "无法删除引用 %s%s"
#: refs/files-backend.c:1251 refs/packed-backend.c:1545
#, c-format
msgid "could not delete references: %s"
msgstr "无法删除引用:%s"
#: refspec.c:137
#, c-format
msgid "invalid refspec '%s'"
msgstr "无效的引用表达式:'%s'"
#: ref-filter.c:42 wt-status.c:1934
msgid "gone"
msgstr "丢失"
#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "领先 %d"
#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "落后 %d"
#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "领先 %d落后 %d"
#: ref-filter.c:162
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "期望的格式:%%(color:<颜色>)"
#: ref-filter.c:164
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "未能识别的颜色:%%(color:%s)"
#: ref-filter.c:186
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "期望整数值 refname:lstrip=%s"
#: ref-filter.c:190
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "期望整数值 refname:rstrip=%s"
#: ref-filter.c:192
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "未能识别的 %%(%s) 参数:%s"
#: ref-filter.c:247
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) 不带参数"
#: ref-filter.c:269
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "未能识别的 %%(objectsize) 参数:%s"
#: ref-filter.c:277
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) 不带参数"
#: ref-filter.c:289
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) 不带参数"
#: ref-filter.c:298
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) 不带参数"
#: ref-filter.c:320
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "未知的 %%(trailers) 参数:%s"
#: ref-filter.c:349
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "期望一个正数 contents:lines=%s"
#: ref-filter.c:351
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "未能识别的 %%(contents) 参数:%s"
#: ref-filter.c:366
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "期望一个正数 objectname:short=%s"
#: ref-filter.c:370
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "未能识别的 %%(objectname) 参数:%s"
#: ref-filter.c:400
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "期望的格式:%%(align:<宽度>,<位置>)"
#: ref-filter.c:412
#, c-format
msgid "unrecognized position:%s"
msgstr "未能识别的位置:%s"
#: ref-filter.c:419
#, c-format
msgid "unrecognized width:%s"
msgstr "未能识别的宽度:%s"
#: ref-filter.c:428
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "未能识别的 %%(align) 参数:%s"
#: ref-filter.c:436
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "元素 %%(align) 需要一个正数的宽度"
#: ref-filter.c:454
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "未能识别的 %%(if) 参数:%s"
#: ref-filter.c:556
#, c-format
msgid "malformed field name: %.*s"
msgstr "格式错误的字段名:%.*s"
#: ref-filter.c:583
#, c-format
msgid "unknown field name: %.*s"
msgstr "未知的字段名:%.*s"
#: ref-filter.c:587
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr "不是一个 git 仓库,但是字段 '%.*s' 需要访问对象数据"
#: ref-filter.c:711
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素"
#: ref-filter.c:774
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素"
#: ref-filter.c:776
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "格式:%%(then) 元素用了多次"
#: ref-filter.c:778
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "格式:%%(then) 元素用在了 %%(else) 之后"
#: ref-filter.c:806
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素"
#: ref-filter.c:808
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素"
#: ref-filter.c:810
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "格式:%%(else) 元素用了多次"
#: ref-filter.c:825
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
#: ref-filter.c:882
#, c-format
msgid "malformed format string %s"
msgstr "错误的格式化字符串 %s"
#: ref-filter.c:1485
#, c-format
msgid "no branch, rebasing %s"
msgstr "非分支,正变基 %s"
#: ref-filter.c:1488
#, c-format
msgid "no branch, rebasing detached HEAD %s"
msgstr "非分支,正变基分离头指针 %s"
#: ref-filter.c:1491
#, c-format
msgid "no branch, bisect started on %s"
msgstr "非分支,二分查找开始于 %s"
#: ref-filter.c:1501
msgid "no branch"
msgstr "非分支"
#: ref-filter.c:1537 ref-filter.c:1743
#, c-format
msgid "missing object %s for %s"
msgstr "缺失 %2$s 的对象 %1$s"
#: ref-filter.c:1547
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
#: ref-filter.c:1998
#, c-format
msgid "malformed object at '%s'"
msgstr "格式错误的对象 '%s'"
#: ref-filter.c:2087
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略带有错误名称 %s 的引用"
#: ref-filter.c:2382
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式:缺少 %%(end) 元素"
#: ref-filter.c:2482
#, c-format
msgid "option `%s' is incompatible with --merged"
msgstr "选项 `%s' 和 --merged 不兼容"
#: ref-filter.c:2485
#, c-format
msgid "option `%s' is incompatible with --no-merged"
msgstr "选项 `%s' 和 --no-merged 不兼容"
#: ref-filter.c:2495
#, c-format
msgid "malformed object name %s"
msgstr "格式错误的对象名 %s"
#: ref-filter.c:2500
#, c-format
msgid "option `%s' must point to a commit"
msgstr "选项 `%s' 必须指向一个提交"
#: remote.c:363
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr "配置的远程短名称不能以 '/' 开始:%s"
#: remote.c:410
msgid "more than one receivepack given, using the first"
msgstr "提供了一个以上的 receivepack使用第一个"
#: remote.c:418
msgid "more than one uploadpack given, using the first"
msgstr "提供了一个以上的 uploadpack使用第一个"
#: remote.c:608
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "不能同时获取 %s 和 %s 至 %s"
#: remote.c:612
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常跟踪 %s而非 %s"
#: remote.c:616
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s 同时跟踪 %s 和 %s"
#: remote.c:684
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "模式的键 '%s' 没有 '*'"
#: remote.c:694
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "模式的值 '%s' 没有 '*'"
#: remote.c:1000
#, c-format
msgid "src refspec %s does not match any"
msgstr "源引用表达式 %s 没有匹配"
#: remote.c:1005
#, c-format
msgid "src refspec %s matches more than one"
msgstr "源引用表达式 %s 匹配超过一个"
#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
#: remote.c:1020
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
"starting with \"refs/\"). We tried to guess what you meant by:\n"
"\n"
"- Looking for a ref that matches '%s' on the remote side.\n"
"- Checking if the <src> being pushed ('%s')\n"
" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
" refs/{heads,tags}/ prefix on the remote side.\n"
"\n"
"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
"您提供的目标不是一个完整的引用名称(即以 \"refs/\" 开头)。我们\n"
"试着猜测您的想法:\n"
"\n"
"- 在远端查询和 '%s' 匹配的引用。\n"
"- 检查要推送的 <src>'%s')是不是在 \"refs/{heads,tags}/\" 中的\n"
" 引用。如果是,我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n"
"\n"
"都不行,所以我们已放弃。您必须给出完整的引用。"
#: remote.c:1040
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
"Did you mean to create a new branch by pushing to\n"
"'%s:refs/heads/%s'?"
msgstr ""
"引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
"'%s:refs/heads/%s' 推送么?"
#: remote.c:1045
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
"Did you mean to create a new tag by pushing to\n"
"'%s:refs/tags/%s'?"
msgstr ""
"引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
"'%s:refs/tags/%s' 推送么?"
#: remote.c:1050
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
"Did you mean to tag a new tree by pushing to\n"
"'%s:refs/tags/%s'?"
msgstr ""
"引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
"'%s:refs/tags/%s' 推送么?"
#: remote.c:1055
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
"Did you mean to tag a new blob by pushing to\n"
"'%s:refs/tags/%s'?"
msgstr ""
"引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
"'%s:refs/tags/%s' 推送么?"
#: remote.c:1091
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s 无法被解析为分支"
#: remote.c:1102
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "无法删除 '%s':远程引用不存在"
#: remote.c:1114
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "目标引用表达式 %s 匹配超过一个"
#: remote.c:1121
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "目标引用 %s 接收超过一个源"
#: remote.c:1624 remote.c:1725
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指向一个分支"
#: remote.c:1633
#, c-format
msgid "no such branch: '%s'"
msgstr "没有此分支:'%s'"
#: remote.c:1636
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"
#: remote.c:1642
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
#: remote.c:1657
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
#: remote.c:1669
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 没有设置要推送的远程服务器"
#: remote.c:1679
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "向 '%s' 推送引用规格未包含 '%s'"
#: remote.c:1692
msgid "push has no destination (push.default is 'nothing')"
msgstr "推送无目标push.default 是 'nothing'"
#: remote.c:1714
msgid "cannot resolve 'simple' push to a single destination"
msgstr "无法解析 'simple' 推送至一个单独的目标"
#: remote.c:1840
#, c-format
msgid "couldn't find remote ref %s"
msgstr "无法找到远程引用 %s"
#: remote.c:1853
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* 在本地忽略可笑的引用 '%s'"
#: remote.c:2016
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
#: remote.c:2020
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
#: remote.c:2023
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "您的分支与上游分支 '%s' 一致。\n"
#: remote.c:2027
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "您的分支和 '%s' 指向不同的提交。\n"
#: remote.c:2030
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (使用 \"%s\" 查看详情)\n"
#: remote.c:2034
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
#: remote.c:2040
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
#: remote.c:2043
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
# 译者:注意保持前导空格
#: remote.c:2051
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
#: remote.c:2054
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commit each, respectively.\n"
msgid_plural ""
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commits each, respectively.\n"
msgstr[0] ""
"您的分支和 '%s' 出现了偏离,\n"
"并且分别有 %d 和 %d 处不同的提交。\n"
msgstr[1] ""
"您的分支和 '%s' 出现了偏离,\n"
"并且分别有 %d 和 %d 处不同的提交。\n"
# 译者:注意保持前导空格
#: remote.c:2064
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (使用 \"git pull\" 来合并远程分支)\n"
#: remote.c:2247
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "无法解析期望的对象名 '%s'"
#: replace-object.c:21
#, c-format
msgid "bad replace ref name: %s"
msgstr "错误的替换引用名称:%s"
#: replace-object.c:30
#, c-format
msgid "duplicate replace ref: %s"
msgstr "重复的替换引用:%s"
#: replace-object.c:73
#, c-format
msgid "replace depth too high for object %s"
msgstr "对象 %s 的替换层级太深"
#: rerere.c:217 rerere.c:226 rerere.c:229
msgid "corrupt MERGE_RR"
msgstr "损坏的 MERGE_RR"
#: rerere.c:264 rerere.c:269
msgid "unable to write rerere record"
msgstr "无法写入 rerere 记录"
#: rerere.c:495
#, c-format
msgid "there were errors while writing '%s' (%s)"
msgstr "写入 '%s' (%s) 时出错"
#: rerere.c:498
#, c-format
msgid "failed to flush '%s'"
msgstr "刷新 '%s' 失败"
#: rerere.c:503 rerere.c:1039
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "不能解析 '%s' 中的冲突块"
#: rerere.c:684
#, c-format
msgid "failed utime() on '%s'"
msgstr "在 '%s' 上调用 utime() 失败"
#: rerere.c:694
#, c-format
msgid "writing '%s' failed"
msgstr "写入 '%s' 失败"
#: rerere.c:714
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr "使用之前的解决方案暂存 '%s'。"
#: rerere.c:753
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "已记录 '%s' 的解决方案。"
#: rerere.c:788
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "使用之前的解决方案解决 '%s'。"
#: rerere.c:803
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "不能删除 stray '%s'"
#: rerere.c:807
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "为 '%s' 记录 preimage"
#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
#, c-format
msgid "could not create directory '%s'"
msgstr "不能创建目录 '%s'"
#: rerere.c:1057
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "更新 '%s' 中的冲突状态失败"
#: rerere.c:1068 rerere.c:1075
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "没有为 '%s' 记忆的解决方案"
#: rerere.c:1077
#, c-format
msgid "cannot unlink '%s'"
msgstr "不能删除 '%s'"
#: rerere.c:1087
#, c-format
msgid "Updated preimage for '%s'"
msgstr "已为 '%s' 更新 preimage"
#: rerere.c:1096
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "忘记 '%s' 的解决方案\n"
#: rerere.c:1199
msgid "unable to open rr-cache directory"
msgstr "不能打开 rr-cache 目录"
#: revision.c:2507
msgid "your current branch appears to be broken"
msgstr "您的当前分支好像被损坏"
#: revision.c:2510
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的当前分支 '%s' 尚无任何提交"
#: revision.c:2710
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent 与 --bisect 不兼容"
#: revision.c:2714
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
#: run-command.c:763
msgid "open /dev/null failed"
msgstr "不能打开 /dev/null"
#: run-command.c:1269
#, c-format
msgid "cannot create async thread: %s"
msgstr "不能创建 async 线程:%s"
#: run-command.c:1333
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
"You can disable this warning with `git config advice.ignoredHook false`."
msgstr ""
"因为没有将钩子 '%s' 设置为可执行,钩子被忽略。您可以通过\n"
"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
#: send-pack.c:141
msgid "unexpected flush packet while reading remote unpack status"
msgstr "读取远程解包状态时收到意外的 flush 包"
#: send-pack.c:143
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "不能解析远程解包状态:%s"
#: send-pack.c:145
#, c-format
msgid "remote unpack failed: %s"
msgstr "远程解包失败:%s"
#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "为推送证书签名失败"
#: send-pack.c:420
msgid "the receiving end does not support --signed push"
msgstr "接收端不支持签名推送"
#: send-pack.c:422
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr "未发送推送证书,因为接收端不支持签名推送"
#: send-pack.c:434
msgid "the receiving end does not support --atomic push"
msgstr "接收端不支持原子推送"
#: send-pack.c:439
msgid "the receiving end does not support push options"
msgstr "接收端不支持推送选项"
#: sequencer.c:187
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "无效的提交信息清理模式 '%s'"
#: sequencer.c:292
#, c-format
msgid "could not delete '%s'"
msgstr "无法删除 '%s'"
#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr "无法删除 '%s'"
#: sequencer.c:321
msgid "revert"
msgstr "还原"
#: sequencer.c:323
msgid "cherry-pick"
msgstr "拣选"
#: sequencer.c:325
msgid "rebase -i"
msgstr "rebase -i"
#: sequencer.c:327
#, c-format
msgid "unknown action: %d"
msgstr "未知动作:%d"
#: sequencer.c:385
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
"命令标记修正后的文件"
#: sequencer.c:388
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr ""
"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
"对修正后的文件做标记,然后用 'git commit' 提交"
#: sequencer.c:401 sequencer.c:2909
#, c-format
msgid "could not lock '%s'"
msgstr "不能锁定 '%s'"
#: sequencer.c:408
#, c-format
msgid "could not write eol to '%s'"
msgstr "不能将换行符写入 '%s'"
#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
#: sequencer.c:3192
#, c-format
msgid "failed to finalize '%s'"
msgstr "无法完成 '%s'"
#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
#: builtin/merge.c:1112 builtin/rebase.c:567
#, c-format
msgid "could not read '%s'"
msgstr "不能读取 '%s'"
#: sequencer.c:462
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "您的本地修改将被%s覆盖。"
#: sequencer.c:466
msgid "commit your changes or stash them to proceed."
msgstr "提交您的修改或贮藏后再继续。"
#: sequencer.c:498
#, c-format
msgid "%s: fast-forward"
msgstr "%s快进"
#: sequencer.c:537 builtin/tag.c:565
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
#: sequencer.c:632
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s无法写入新索引文件"
#: sequencer.c:649
msgid "unable to update cache tree"
msgstr "不能更新缓存树"
#: sequencer.c:663
msgid "could not resolve HEAD commit"
msgstr "不能解析 HEAD 提交"
#: sequencer.c:743
#, c-format
msgid "no key present in '%.*s'"
msgstr "在 '%.*s' 中没有 key"
#: sequencer.c:754
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "无法为 '%s' 的值去引号"
#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读取"
#: sequencer.c:801
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "已经给出 'GIT_AUTHOR_NAME'"
#: sequencer.c:806
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
#: sequencer.c:811
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "已经给出 'GIT_AUTHOR_DATE'"
#: sequencer.c:815
#, c-format
msgid "unknown variable '%s'"
msgstr "未知变量 '%s'"
#: sequencer.c:820
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "缺少 'GIT_AUTHOR_NAME'"
#: sequencer.c:822
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "缺少 'GIT_AUTHOR_EMAIL'"
#: sequencer.c:824
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "缺少 'GIT_AUTHOR_DATE'"
#: sequencer.c:884
#, c-format
msgid "invalid date format '%s' in '%s'"
msgstr "'%2$s' 中无效的日期格式 '%1$s'"
#: sequencer.c:901
#, c-format
msgid ""
"you have staged changes in your working tree\n"
"If these changes are meant to be squashed into the previous commit, run:\n"
"\n"
" git commit --amend %s\n"
"\n"
"If they are meant to go into a new commit, run:\n"
"\n"
" git commit %s\n"
"\n"
"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr ""
"您的工作区中存在已暂存的修改\n"
"如果这些修改需要被并入前一个提交,执行:\n"
"\n"
" git commit --amend %s\n"
"\n"
"如果这些修改要形成一个新提交,执行:\n"
"\n"
" git commit %s\n"
"\n"
"无论哪种情况,当您完成提交,继续执行:\n"
"\n"
" git rebase --continue\n"
#: sequencer.c:995
msgid "writing root commit"
msgstr "写根提交"
#: sequencer.c:1216
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' 钩子失败"
#: sequencer.c:1223
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"You can suppress this message by setting them explicitly. Run the\n"
"following command and follow the instructions in your editor to edit\n"
"your configuration file:\n"
"\n"
" git config --global --edit\n"
"\n"
"After doing this, you may fix the identity used for this commit with:\n"
"\n"
" git commit --amend --reset-author\n"
msgstr ""
"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
"中编辑您的配置文件:\n"
"\n"
" git config --global --edit\n"
"\n"
"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
"\n"
" git commit --amend --reset-author\n"
#: sequencer.c:1236
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
"You can suppress this message by setting them explicitly:\n"
"\n"
" git config --global user.name \"Your Name\"\n"
" git config --global user.email you@example.com\n"
"\n"
"After doing this, you may fix the identity used for this commit with:\n"
"\n"
" git commit --amend --reset-author\n"
msgstr ""
"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
"与否。您可以对其进行设置以免再出现本提示信息:\n"
"\n"
" git config --global user.name \"Your Name\"\n"
" git config --global user.email you@example.com\n"
"\n"
"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
"\n"
" git commit --amend --reset-author\n"
#: sequencer.c:1278
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
#: sequencer.c:1280
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
#: sequencer.c:1326
msgid "unable to resolve HEAD after creating commit"
msgstr "创建提交后,不能解析 HEAD"
#: sequencer.c:1328
msgid "detached HEAD"
msgstr "分离头指针"
# 译者:中文字符串拼接,可删除前导空格
#: sequencer.c:1332
msgid " (root-commit)"
msgstr "(根提交)"
#: sequencer.c:1353
msgid "could not parse HEAD"
msgstr "不能解析 HEAD"
#: sequencer.c:1355
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s 不是一个提交!"
#: sequencer.c:1359 builtin/commit.c:1571
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
#: sequencer.c:1411 sequencer.c:2004
msgid "unable to parse commit author"
msgstr "不能解析提交作者"
#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入树对象"
#: sequencer.c:1438 sequencer.c:1499
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "不能从 '%s' 读取提交说明"
#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
#: builtin/merge.c:903
msgid "failed to write commit object"
msgstr "写提交对象失败"
#: sequencer.c:1526
#, c-format
msgid "could not parse commit %s"
msgstr "不能解析提交 %s"
#: sequencer.c:1531
#, c-format
msgid "could not parse parent commit %s"
msgstr "不能解析父提交 %s"
#: sequencer.c:1605 sequencer.c:1715
#, c-format
msgid "unknown command: %d"
msgstr "未知命令:%d"
#: sequencer.c:1662 sequencer.c:1687
#, c-format
msgid "This is a combination of %d commits."
msgstr "这是一个 %d 个提交的组合。"
#: sequencer.c:1672
msgid "need a HEAD to fixup"
msgstr "需要一个 HEAD 来修复"
#: sequencer.c:1674 sequencer.c:3219
msgid "could not read HEAD"
msgstr "不能读取 HEAD"
#: sequencer.c:1676
msgid "could not read HEAD's commit message"
msgstr "不能读取 HEAD 的提交说明"
#: sequencer.c:1682
#, c-format
msgid "cannot write '%s'"
msgstr "不能写 '%s'"
#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
msgid "This is the 1st commit message:"
msgstr "这是第一个提交说明:"
#: sequencer.c:1697
#, c-format
msgid "could not read commit message of %s"
msgstr "不能读取 %s 的提交说明"
#: sequencer.c:1704
#, c-format
msgid "This is the commit message #%d:"
msgstr "这是提交说明 #%d"
#: sequencer.c:1710
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "提交说明 #%d 将被跳过:"
#: sequencer.c:1798
msgid "your index file is unmerged."
msgstr "您的索引文件未完成合并。"
#: sequencer.c:1805
msgid "cannot fixup root commit"
msgstr "不能修复根提交"
#: sequencer.c:1824
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
#: sequencer.c:1832 sequencer.c:1840
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 没有第 %d 个父提交"
#: sequencer.c:1846
#, c-format
msgid "cannot get commit message for %s"
msgstr "不能得到 %s 的提交说明"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
#: sequencer.c:1865
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s不能解析父提交 %s"
#: sequencer.c:1930
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能将 '%s' 重命名为 '%s'"
#: sequencer.c:1985
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
#: sequencer.c:1986
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
#: sequencer.c:2045
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s无法读取索引"
#: sequencer.c:2052
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s无法刷新索引"
#: sequencer.c:2128
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s 不接受参数:'%s'"
#: sequencer.c:2137
#, c-format
msgid "missing arguments for %s"
msgstr "缺少 %s 的参数"
#: sequencer.c:2174
#, c-format
msgid "could not parse '%.*s'"
msgstr "无法解析 '%.*s'"
#: sequencer.c:2228
#, c-format
msgid "invalid line %d: %.*s"
msgstr "无效行 %d%.*s"
#: sequencer.c:2239
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "没有父提交的情况下不能 '%s'"
#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
#: builtin/rebase.c:204 builtin/rebase.c:229
#, c-format
msgid "could not read '%s'."
msgstr "不能读取 '%s'。"
#: sequencer.c:2323
msgid "cancelling a cherry picking in progress"
msgstr "正在取消一个进行中的拣选"
#: sequencer.c:2330
msgid "cancelling a revert in progress"
msgstr "正在取消一个进行中的还原"
#: sequencer.c:2364
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "请用 'git rebase --edit-todo' 来修改。"
#: sequencer.c:2366
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清单:'%s'"
#: sequencer.c:2371
msgid "no commits parsed."
msgstr "没有解析提交。"
#: sequencer.c:2382
msgid "cannot cherry-pick during a revert."
msgstr "不能在回退中执行拣选。"
#: sequencer.c:2384
msgid "cannot revert during a cherry-pick."
msgstr "不能在拣选中执行回退。"
#: sequencer.c:2466
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值无效:%s"
#: sequencer.c:2553
msgid "unusable squash-onto"
msgstr "不可用的 squash-onto"
#: sequencer.c:2569
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "格式错误的选项清单:'%s'"
#: sequencer.c:2652 sequencer.c:4351
msgid "empty commit set passed"
msgstr "提供了空的提交集"
#: sequencer.c:2668
msgid "revert is already in progress"
msgstr "一个还原操作已在进行"
#: sequencer.c:2670
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
#: sequencer.c:2673
msgid "cherry-pick is already in progress"
msgstr "拣选操作已在进行"
#: sequencer.c:2675
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
#: sequencer.c:2689
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能创建序列目录 '%s'"
#: sequencer.c:2704
msgid "could not lock HEAD"
msgstr "不能锁定 HEAD"
#: sequencer.c:2764 sequencer.c:4103
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
#: sequencer.c:2766 sequencer.c:2777
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
#: sequencer.c:2768 sequencer.c:2812
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
#: sequencer.c:2798 builtin/grep.c:734
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
#: sequencer.c:2800
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能读取 '%s'%s"
#: sequencer.c:2801
msgid "unexpected end of file"
msgstr "意外的文件结束"
#: sequencer.c:2807
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
#: sequencer.c:2818
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移动了 HEAD。未能回退检查您的 HEAD"
#: sequencer.c:2859
msgid "no revert in progress"
msgstr "没有正在进行的还原"
#: sequencer.c:2867
msgid "no cherry-pick in progress"
msgstr "没有正在进行的拣选"
#: sequencer.c:2877
msgid "failed to skip the commit"
msgstr "无法跳过这个提交"
#: sequencer.c:2884
msgid "there is nothing to skip"
msgstr "没有要跳过的"
#: sequencer.c:2887
#, c-format
msgid ""
"have you committed already?\n"
"try \"git %s --continue\""
msgstr ""
"您已经提交了么?\n"
"试试 \"git %s --continue\""
#: sequencer.c:3011 sequencer.c:4015
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
#: sequencer.c:3049 sequencer.c:3995
msgid "cannot read HEAD"
msgstr "不能读取 HEAD"
#: sequencer.c:3066
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "无法拷贝 '%s' 至 '%s'"
#: sequencer.c:3074
#, c-format
msgid ""
"You can amend the commit now, with\n"
"\n"
" git commit --amend %s\n"
"\n"
"Once you are satisfied with your changes, run\n"
"\n"
" git rebase --continue\n"
msgstr ""
"您现在可以修补这个提交,使用\n"
"\n"
" git commit --amend %s\n"
"\n"
"当您对变更感到满意,执行\n"
"\n"
" git rebase --continue\n"
#: sequencer.c:3084
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "不能应用 %s... %.*s"
#: sequencer.c:3091
#, c-format
msgid "Could not merge %.*s"
msgstr "不能合并 %.*s"
#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
#: builtin/rebase.c:1953 builtin/rebase.c:2008
msgid "could not read index"
msgstr "不能读取索引"
# 译者:注意保持前导空格
#: sequencer.c:3136
#, c-format
msgid ""
"execution failed: %s\n"
"%sYou can fix the problem, and then run\n"
"\n"
" git rebase --continue\n"
"\n"
msgstr ""
"执行失败:%s\n"
"%s您可以改正该问题然后运行\n"
"\n"
" git rebase --continue\n"
"\n"
#: sequencer.c:3142
msgid "and made changes to the index and/or the working tree\n"
msgstr "并且修改索引和/或工作区\n"
#: sequencer.c:3148
#, c-format
msgid ""
"execution succeeded: %s\n"
"but left changes to the index and/or the working tree\n"
"Commit or stash your changes, and then run\n"
"\n"
" git rebase --continue\n"
"\n"
msgstr ""
"执行成功:%s\n"
"但是在索引和/或工作区中存在变更\n"
"提交或贮藏修改,然后运行\n"
"\n"
" git rebase --continue\n"
"\n"
#: sequencer.c:3209
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "非法的标签名称:'%.*s'"
#: sequencer.c:3263
msgid "writing fake root commit"
msgstr "写伪根提交"
#: sequencer.c:3268
msgid "writing squash-onto"
msgstr "写入 squash-onto"
#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
#, c-format
msgid "failed to find tree of %s"
msgstr "无法找到 %s 指向的树。"
#: sequencer.c:3324 builtin/rebase.c:873
msgid "could not write index"
msgstr "不能写入索引"
#: sequencer.c:3351
#, c-format
msgid "could not resolve '%s'"
msgstr "无法解析 '%s'"
#: sequencer.c:3379
msgid "cannot merge without a current revision"
msgstr "没有当前版本不能合并"
#: sequencer.c:3401
#, c-format
msgid "unable to parse '%.*s'"
msgstr "无法解析 '%.*s'"
#: sequencer.c:3410
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "无可用合并:'%.*s'"
#: sequencer.c:3422
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "章鱼合并不能在一个新的根提交上执行"
#: sequencer.c:3437
#, c-format
msgid "could not get commit message of '%s'"
msgstr "不能获取 '%s' 的提交说明"
#: sequencer.c:3590
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "甚至不能尝试合并 '%.*s'"
#: sequencer.c:3606
msgid "merge: Unable to write new index file"
msgstr "合并:无法写入新索引文件"
#: sequencer.c:3675 builtin/rebase.c:711
#, c-format
msgid "Applied autostash.\n"
msgstr "已应用 autostash。\n"
#: sequencer.c:3687
#, c-format
msgid "cannot store %s"
msgstr "不能存储 %s"
#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
"应用 autostash 导致冲突。\n"
"您的修改安全地保存在贮藏区中。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
#: sequencer.c:3751
#, c-format
msgid "could not checkout %s"
msgstr "不能检出 %s"
#: sequencer.c:3765
#, c-format
msgid "%s: not a valid OID"
msgstr "%s不是一个有效的对象 ID"
#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
msgid "could not detach HEAD"
msgstr "不能分离头指针"
#: sequencer.c:3785
#, c-format
msgid "Stopped at HEAD\n"
msgstr "停止在 HEAD\n"
#: sequencer.c:3787
#, c-format
msgid "Stopped at %s\n"
msgstr "停止在 %s\n"
#: sequencer.c:3795
#, c-format
msgid ""
"Could not execute the todo command\n"
"\n"
" %.*s\n"
"It has been rescheduled; To edit the command before continuing, please\n"
"edit the todo list first:\n"
"\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
msgstr ""
"无法执行待办命令\n"
"\n"
" %.*s\n"
"已被重新安排,在继续之前编辑命令,请先编辑待办列表:\n"
"\n"
" git rebase --edit-todo\n"
" git rebase --continue\n"
#: sequencer.c:3877
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
#: sequencer.c:3958
#, c-format
msgid "unknown command %d"
msgstr "未知命令 %d"
#: sequencer.c:4003
msgid "could not read orig-head"
msgstr "不能读取 orig-head"
#: sequencer.c:4008
msgid "could not read 'onto'"
msgstr "不能读取 'onto'"
#: sequencer.c:4022
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 为 %s"
#: sequencer.c:4115
msgid "cannot rebase: You have unstaged changes."
msgstr "不能变基:您有未暂存的变更。"
#: sequencer.c:4124
msgid "cannot amend non-existing commit"
msgstr "不能修补不存在的提交"
#: sequencer.c:4126
#, c-format
msgid "invalid file: '%s'"
msgstr "无效文件:'%s'"
#: sequencer.c:4128
#, c-format
msgid "invalid contents: '%s'"
msgstr "无效内容:'%s'"
#: sequencer.c:4131
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
"\n"
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
#: sequencer.c:4167 sequencer.c:4205
#, c-format
msgid "could not write file: '%s'"
msgstr "不能写入文件:'%s'"
#: sequencer.c:4220
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
#: sequencer.c:4227
msgid "could not commit staged changes."
msgstr "不能提交暂存的修改。"
#: sequencer.c:4328
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s不能拣选一个%s"
#: sequencer.c:4332
#, c-format
msgid "%s: bad revision"
msgstr "%s错误的版本"
#: sequencer.c:4367
msgid "can't revert as initial commit"
msgstr "不能作为初始提交回退"
#: sequencer.c:4810
msgid "make_script: unhandled options"
msgstr "make_script有未能处理的选项"
#: sequencer.c:4813
msgid "make_script: error preparing revisions"
msgstr "make_script准备版本时错误"
#: sequencer.c:4971
msgid ""
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
"continue'.\n"
"Or you can abort the rebase with 'git rebase --abort'.\n"
msgstr ""
"您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n"
"或者您可以用 'git rebase --abort' 终止变基。\n"
#: sequencer.c:5083 sequencer.c:5100
msgid "nothing to do"
msgstr "无事可做"
#: sequencer.c:5114
msgid "could not skip unnecessary pick commands"
msgstr "无法跳过不必要的拣选"
#: sequencer.c:5197
msgid "the script was already rearranged."
msgstr "脚本已经重新编排。"
#: setup.c:123
#, c-format
msgid "'%s' is outside repository"
msgstr "'%s' 在仓库之外"
#: setup.c:173
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
"%s工作区中无此路径。\n"
"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
#: setup.c:186
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
"Use '--' to separate paths from revisions, like this:\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
"使用 '--' 来分隔版本和路径,例如:\n"
"'git <命令> [<版本>...] -- [<文件>...]'"
#: setup.c:235
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "选项 '%s' 必须在其他非选项参数之前"
#: setup.c:254
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
"Use '--' to separate paths from revisions, like this:\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
"有歧义的参数 '%s':可同时是版本和文件\n"
"使用 '--' 来分隔版本和路径,例如:\n"
"'git <命令> [<版本>...] -- [<文件>...]'"
#: setup.c:390
msgid "unable to set up work tree using invalid config"
msgstr "无法使用无效配置来创建工作区"
#: setup.c:394
msgid "this operation must be run in a work tree"
msgstr "该操作必须在一个工作区中运行"
#: setup.c:540
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "期望 git 仓库版本 <= %d却得到 %d"
#: setup.c:548
msgid "unknown repository extensions found:"
msgstr "发现未知的仓库扩展:"
#: setup.c:567
#, c-format
msgid "error opening '%s'"
msgstr "打开 '%s' 出错"
#: setup.c:569
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "文件太大,无法作为 .git 文件:'%s'"
#: setup.c:571
#, c-format
msgid "error reading %s"
msgstr "读取 %s 出错"
#: setup.c:573
#, c-format
msgid "invalid gitfile format: %s"
msgstr "无效的 gitfile 格式:%s"
#: setup.c:575
#, c-format
msgid "no path in gitfile: %s"
msgstr "在 gitfile 中没有路径:%s"
#: setup.c:577
#, c-format
msgid "not a git repository: %s"
msgstr "不是一个 git 仓库:%s"
#: setup.c:676
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' 太大"
#: setup.c:690
#, c-format
msgid "not a git repository: '%s'"
msgstr "不是一个 git 仓库:'%s'"
#: setup.c:719 setup.c:721 setup.c:752
#, c-format
msgid "cannot chdir to '%s'"
msgstr "不能切换目录到 '%s'"
#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
msgid "cannot come back to cwd"
msgstr "无法返回当前工作目录"
#: setup.c:851
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "获取 '%*s%s%s' 状态stat失败"
#: setup.c:1083
msgid "Unable to read current working directory"
msgstr "不能读取当前工作目录"
#: setup.c:1092 setup.c:1098
#, c-format
msgid "cannot change to '%s'"
msgstr "不能切换到 '%s'"
#: setup.c:1103
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "不是一个 git 仓库(或者任何父目录):%s"
#: setup.c:1109
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
"不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n"
"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM。"
#: setup.c:1220
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr ""
"参数 core.sharedRepository 的文件属性值有问题0%.3o)。\n"
"文件属主必须始终拥有读写权限。"
#: setup.c:1264
msgid "open /dev/null or dup failed"
msgstr "不能打开或者复制 /dev/null"
#: setup.c:1279
msgid "fork failed"
msgstr "fork 失败"
#: setup.c:1284
msgid "setsid failed"
msgstr "setsid 失败"
#: sha1-file.c:453
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates"
#: sha1-file.c:504
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "无法规范化备用对象路径:%s"
#: sha1-file.c:576
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr "%s忽略备用对象库嵌套太深"
#: sha1-file.c:583
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "无法规范化对象目录: %s"
#: sha1-file.c:626
msgid "unable to fdopen alternates lockfile"
msgstr "无法 fdopen 替换锁文件"
#: sha1-file.c:644
msgid "unable to read alternates file"
msgstr "无法读取替代文件"
#: sha1-file.c:651
msgid "unable to move new alternates file into place"
msgstr "无法将新的替代文件移动到位"
#: sha1-file.c:686
#, c-format
msgid "path '%s' does not exist"
msgstr "路径 '%s' 不存在"
#: sha1-file.c:712
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
#: sha1-file.c:718
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "参考仓库 '%s' 不是一个本地仓库。"
#: sha1-file.c:724
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "参考仓库 '%s' 是一个浅克隆"
#: sha1-file.c:732
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "参考仓库 '%s' 已被移植"
#: sha1-file.c:792
#, c-format
msgid "invalid line while parsing alternate refs: %s"
msgstr "解析备用引用时无效的行:%s"
#: sha1-file.c:944
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>"
#: sha1-file.c:969
msgid "mmap failed"
msgstr "mmap 失败"
#: sha1-file.c:1133
#, c-format
msgid "object file %s is empty"
msgstr "对象文件 %s 为空"
#: sha1-file.c:1257 sha1-file.c:2396
#, c-format
msgid "corrupt loose object '%s'"
msgstr "损坏的松散对象 '%s'"
#: sha1-file.c:1259 sha1-file.c:2400
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr "松散对象 '%s' 后面有垃圾数据"
#: sha1-file.c:1301
msgid "invalid object type"
msgstr "无效的对象类型"
#: sha1-file.c:1385
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
#: sha1-file.c:1388
#, c-format
msgid "unable to unpack %s header"
msgstr "无法解开 %s 头部"
#: sha1-file.c:1394
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
#: sha1-file.c:1397
#, c-format
msgid "unable to parse %s header"
msgstr "无法解析 %s 头部"
#: sha1-file.c:1588
#, c-format
msgid "failed to read object %s"
msgstr "读取对象 %s 失败"
#: sha1-file.c:1592
#, c-format
msgid "replacement %s not found for %s"
msgstr "找不到 %2$s 的替代 %1$s"
#: sha1-file.c:1596
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr "松散对象 %s保存在 %s已损坏"
#: sha1-file.c:1600
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr "打包对象 %s保存在 %s已损坏"
#: sha1-file.c:1703
#, c-format
msgid "unable to write file %s"
msgstr "无法写文件 %s"
#: sha1-file.c:1710
#, c-format
msgid "unable to set permission to '%s'"
msgstr "无法为 '%s' 设置权限"
#: sha1-file.c:1717
msgid "file write error"
msgstr "文件写错误"
#: sha1-file.c:1736
msgid "error when closing loose object file"
msgstr "关闭松散对象文件时出错"
#: sha1-file.c:1801
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr "权限不足,无法在仓库对象库 %s 中添加对象"
#: sha1-file.c:1803
msgid "unable to create temporary file"
msgstr "无法创建临时文件"
#: sha1-file.c:1827
msgid "unable to write loose object file"
msgstr "不能写松散对象文件"
#: sha1-file.c:1833
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr "不能压缩新对象 %s%d"
#: sha1-file.c:1837
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "在对象 %s 上调用 deflateEnd 失败(%d"
#: sha1-file.c:1841
#, c-format
msgid "confused by unstable object source data for %s"
msgstr "被 %s 的不稳定对象源数据搞糊涂了"
#: sha1-file.c:1851 builtin/pack-objects.c:925
#, c-format
msgid "failed utime() on %s"
msgstr "在 %s 上调用 utime() 失败"
#: sha1-file.c:1926
#, c-format
msgid "cannot read object for %s"
msgstr "不能读取对象 %s"
#: sha1-file.c:1966
msgid "corrupt commit"
msgstr "损坏的提交"
#: sha1-file.c:1974
msgid "corrupt tag"
msgstr "损坏的标签"
#: sha1-file.c:2073
#, c-format
msgid "read error while indexing %s"
msgstr "索引 %s 时读取错误"
#: sha1-file.c:2076
#, c-format
msgid "short read while indexing %s"
msgstr "索引 %s 时读入不完整"
#: sha1-file.c:2149 sha1-file.c:2158
#, c-format
msgid "%s: failed to insert into database"
msgstr "%s插入数据库失败"
#: sha1-file.c:2164
#, c-format
msgid "%s: unsupported file type"
msgstr "%s不支持的文件类型"
#: sha1-file.c:2188
#, c-format
msgid "%s is not a valid object"
msgstr "%s 不是一个有效的对象"
#: sha1-file.c:2190
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s 不是一个有效的 '%s' 对象"
#: sha1-file.c:2217 builtin/index-pack.c:155
#, c-format
msgid "unable to open %s"
msgstr "不能打开 %s"
#: sha1-file.c:2407 sha1-file.c:2459
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "%s 的哈希值不匹配(预期 %s"
#: sha1-file.c:2431
#, c-format
msgid "unable to mmap %s"
msgstr "不能 mmap %s"
#: sha1-file.c:2436
#, c-format
msgid "unable to unpack header of %s"
msgstr "无法解压缩 %s 的头部"
#: sha1-file.c:2442
#, c-format
msgid "unable to parse header of %s"
msgstr "无法解析 %s 的头部"
#: sha1-file.c:2453
#, c-format
msgid "unable to unpack contents of %s"
msgstr "无法解压缩 %s 的内容"
#: sha1-name.c:490
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "短 SHA1 %s 存在歧义"
#: sha1-name.c:501
msgid "The candidates are:"
msgstr "候选者有:"
#: sha1-name.c:800
msgid ""
"Git normally never creates a ref that ends with 40 hex characters\n"
"because it will be ignored when you just specify 40-hex. These refs\n"
"may be created by mistake. For example,\n"
"\n"
" git switch -c $br $(git rev-parse ...)\n"
"\n"
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
"examine these refs and maybe delete them. Turn this message off by\n"
"running \"git config advice.objectNameWarning false\""
msgstr ""
"Git 通常不会创建一个以40个十六进制字符结尾的引用因为当您只提供40\n"
"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如:\n"
"\n"
" git switch -c $br $(git rev-parse ...)\n"
"\n"
"当 \"$br\" 某种原因空白时一个40位十六进制的引用将被创建。请检查这些\n"
"引用,可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
"false\" 命令关闭本消息通知。"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
#: strbuf.c:821
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
#: strbuf.c:823
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr "%u.%2.2u GiB/s"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
#: strbuf.c:831
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
#: strbuf.c:833
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr "%u.%2.2u MiB/s"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
#: strbuf.c:840
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
#: strbuf.c:842
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr "%u.%2.2u KiB/s"
#. TRANSLATORS: IEC 80000-13:2008 byte
#: strbuf.c:848
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
msgstr[0] "%u 字节"
msgstr[1] "%u 字节"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
#: strbuf.c:850
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u 字节/秒"
msgstr[1] "%u 字节/秒"
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr "无法修改未合并的 .gitmodules先解决合并冲突"
#: submodule.c:118 submodule.c:147
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
#: submodule.c:154
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "无法移除 %s 的 .gitmodules 条目"
#: submodule.c:165
msgid "staging updated .gitmodules failed"
msgstr "将更新后 .gitmodules 添加暂存区失败"
#: submodule.c:327
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "位于未检出的子模组 '%s'"
#: submodule.c:358
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
#: submodule.c:910
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "子模组条目 '%s'%s是一个 %s不是一个提交"
#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
#: submodule.c:1481
#, c-format
msgid "Could not access submodule '%s'"
msgstr "无法访问子模组 '%s'"
#: submodule.c:1651
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "无法将 '%s' 识别为一个 git 仓库"
#: submodule.c:1789
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "无法在子模组 '%s' 中启动 'git status'"
#: submodule.c:1802
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "无法在子模组 '%s' 中执行 'git status'"
#: submodule.c:1817
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
#: submodule.c:1907
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "子模组 '%s' 中有脏索引"
#: submodule.c:1959
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "子模组 '%s' 无法被更新。"
#: submodule.c:2007
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
#: submodule.c:2019 submodule.c:2074
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "不能查询子模组 '%s' 的名称"
#: submodule.c:2026
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s' to\n"
"'%s'\n"
msgstr ""
"将 '%s%s' 的 git 目录从\n"
"'%s' 迁移至\n"
"'%s'\n"
#: submodule.c:2109
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "无法递归进子模组路径 '%s'"
#: submodule.c:2153
msgid "could not start ls-files in .."
msgstr "无法在 .. 中启动 ls-files"
#: submodule.c:2192
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree 返回未知返回值 %d"
#: submodule-config.c:232
#, c-format
msgid "ignoring suspicious submodule name: %s"
msgstr "忽略可疑的子模组名称:%s"
#: submodule-config.c:299
msgid "negative values not allowed for submodule.fetchjobs"
msgstr "submodule.fetchjobs 不允许为负值"
#: submodule-config.c:397
#, c-format
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
msgstr "忽略可能被解析为命令行选项的 '%s'%s"
#: submodule-config.c:486
#, c-format
msgid "invalid value for %s"
msgstr "%s 的值无效"
#: submodule-config.c:755
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "不能更新 .gitmodules 条目 %s"
#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr "执行 trailer 命令 '%s' 失败"
#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "键 '%2$s' 的未知取值 '%1$s'"
#: trailer.c:539 trailer.c:544 builtin/remote.c:295
#, c-format
msgid "more than one %s"
msgstr "多于一个 %s"
#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "签名 '%.*s' 的键为空"
#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
msgstr "不能读取输入文件 '%s'"
#: trailer.c:753
msgid "could not read from stdin"
msgstr "不能自标准输入读取"
#: trailer.c:1011 wrapper.c:701
#, c-format
msgid "could not stat %s"
msgstr "不能对 %s 调用 stat"
#: trailer.c:1013
#, c-format
msgid "file %s is not a regular file"
msgstr "文件 %s 不是一个正规文件"
#: trailer.c:1015
#, c-format
msgid "file %s is not writable by user"
msgstr "文件 %s 用户不可写"
#: trailer.c:1027
msgid "could not open temporary file"
msgstr "不能打开临时文件"
#: trailer.c:1067
#, c-format
msgid "could not rename temporary file to %s"
msgstr "不能重命名临时文件为 %s"
#: transport.c:116
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
#: transport.c:142
#, c-format
msgid "could not read bundle '%s'"
msgstr "无法读取 bundle '%s'"
#: transport.c:208
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "传输:无效的深度选项 '%s'"
#: transport.c:259
msgid "see protocol.version in 'git help config' for more details"
msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
#: transport.c:260
msgid "server options require protocol version 2 or later"
msgstr "服务端选项需要版本 2 协议或更高"
#: transport.c:625
msgid "could not parse transport.color.* config"
msgstr "不能解析 transport.color.* 配置"
#: transport.c:698
msgid "support for protocol v2 not implemented yet"
msgstr "协议 v2 的支持尚未实现"
#: transport.c:825
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "配置 '%s' 的取值未知:%s"
#: transport.c:891
#, c-format
msgid "transport '%s' not allowed"
msgstr "传输 '%s' 不允许"
#: transport.c:945
msgid "git-over-rsync is no longer supported"
msgstr "不再支持 git-over-rsync"
#: transport.c:1040
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
#: transport.c:1044
#, c-format
msgid ""
"\n"
"Please try\n"
"\n"
"\tgit push --recurse-submodules=on-demand\n"
"\n"
"or cd to the path and use\n"
"\n"
"\tgit push\n"
"\n"
"to push them to a remote.\n"
"\n"
msgstr ""
"\n"
"请尝试\n"
"\n"
"\tgit push --recurse-submodules=on-demand\n"
"\n"
"或者进入到子目录执行\n"
"\n"
"\tgit push\n"
"\n"
"以推送至远程。\n"
"\n"
#: transport.c:1052
msgid "Aborting."
msgstr "正在终止。"
#: transport.c:1193
msgid "failed to push all needed submodules"
msgstr "不能推送全部需要的子模组"
#: transport.c:1340 transport-helper.c:645
msgid "operation not supported by protocol"
msgstr "协议不支持该操作"
#: transport-helper.c:51 transport-helper.c:80
msgid "full write to remote helper failed"
msgstr "完整写入远程助手失败"
#: transport-helper.c:134
#, c-format
msgid "unable to find remote helper for '%s'"
msgstr "无法为 '%s' 找到远程助手"
#: transport-helper.c:150 transport-helper.c:559
msgid "can't dup helper output fd"
msgstr "无法复制助手输出文件句柄"
#: transport-helper.c:201
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
"version of Git"
msgstr "未知的强制能力 %s该远程助手可能需要新版本的Git"
#: transport-helper.c:207
msgid "this remote helper should implement refspec capability"
msgstr "远程助手需要实现 refspec 能力"
#: transport-helper.c:274 transport-helper.c:414
#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr "%s 意外地说:'%s'"
#: transport-helper.c:403
#, c-format
msgid "%s also locked %s"
msgstr "%s 也锁定了 %s"
#: transport-helper.c:481
msgid "couldn't run fast-import"
msgstr "不能执行 fast-import"
#: transport-helper.c:504
msgid "error while running fast-import"
msgstr "执行 fast-import 出错"
#: transport-helper.c:533 transport-helper.c:1105
#, c-format
msgid "could not read ref %s"
msgstr "无法读取引用 %s"
#: transport-helper.c:578
#, c-format
msgid "unknown response to connect: %s"
msgstr "连接时未知的响应:%s"
#: transport-helper.c:600
msgid "setting remote service path not supported by protocol"
msgstr "协议不支持设置远程服务路径"
#: transport-helper.c:602
msgid "invalid remote service path"
msgstr "无效的远程服务路径"
#: transport-helper.c:648
#, c-format
msgid "can't connect to subservice %s"
msgstr "不能连接到子服务 %s"
#: transport-helper.c:720
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr "预期 ok/error助手说 '%s'"
#: transport-helper.c:773
#, c-format
msgid "helper reported unexpected status of %s"
msgstr "助手报告 %s 的意外状态"
#: transport-helper.c:834
#, c-format
msgid "helper %s does not support dry-run"
msgstr "助手 %s 不支持 dry-run"
#: transport-helper.c:837
#, c-format
msgid "helper %s does not support --signed"
msgstr "助手 %s 不支持 --signed"
#: transport-helper.c:840
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr "助手 %s 不支持 --signed=if-asked"
#: transport-helper.c:847
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr "助手 %s 不支持 'push-option'"
#: transport-helper.c:945
msgid "remote-helper doesn't support push; refspec needed"
msgstr "remote-heper 不支持 push需要引用表达式"
#: transport-helper.c:950
#, c-format
msgid "helper %s does not support 'force'"
msgstr "助手 %s 不支持 'force'"
#: transport-helper.c:997
msgid "couldn't run fast-export"
msgstr "无法执行 fast-export"
#: transport-helper.c:1002
msgid "error while running fast-export"
msgstr "执行 fast-export 时出错"
#: transport-helper.c:1027
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
"Perhaps you should specify a branch such as 'master'.\n"
msgstr ""
"没有共同的引用并且也没有指定,什么也不会做。\n"
"可能您应该指定一个分支如 'master'。\n"
#: transport-helper.c:1091
#, c-format
msgid "malformed response in ref list: %s"
msgstr "引用列表中格式错误的响应:%s"
#: transport-helper.c:1244
#, c-format
msgid "read(%s) failed"
msgstr "读取(%s失败"
#: transport-helper.c:1271
#, c-format
msgid "write(%s) failed"
msgstr "写(%s失败"
#: transport-helper.c:1320
#, c-format
msgid "%s thread failed"
msgstr "%s 线程失败"
#: transport-helper.c:1324
#, c-format
msgid "%s thread failed to join: %s"
msgstr "%s 线程等待失败:%s"
#: transport-helper.c:1343 transport-helper.c:1347
#, c-format
msgid "can't start thread for copying data: %s"
msgstr "不能启动线程来拷贝数据:%s"
#: transport-helper.c:1384
#, c-format
msgid "%s process failed to wait"
msgstr "%s 进程等待失败"
#: transport-helper.c:1388
#, c-format
msgid "%s process failed"
msgstr "%s 进程失败"
#: transport-helper.c:1406 transport-helper.c:1415
msgid "can't start thread for copying data"
msgstr "不能启动线程来拷贝数据"
#: tree-walk.c:33
msgid "too-short tree object"
msgstr "太短的树对象"
#: tree-walk.c:39
msgid "malformed mode in tree entry"
msgstr "树对象中的条目模式错误"
#: tree-walk.c:43
msgid "empty filename in tree entry"
msgstr "树对象条目中空的文件名"
#: tree-walk.c:118
msgid "too-short tree file"
msgstr "太短的树文件"
#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
"您对下列文件的本地修改将被检出操作覆盖:\n"
"%%s请在切换分支前提交或贮藏您的修改。"
#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
"您对下列文件的本地修改将被检出操作覆盖:\n"
"%%s"
#: unpack-trees.c:116
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%sPlease commit your changes or stash them before you merge."
msgstr ""
"您对下列文件的本地修改将被合并操作覆盖:\n"
"%%s请在合并前提交或贮藏您的修改。"
#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
"您对下列文件的本地修改将被合并操作覆盖:\n"
"%%s"
#: unpack-trees.c:121
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%sPlease commit your changes or stash them before you %s."
msgstr ""
"您对下列文件的本地修改将被 %s 覆盖:\n"
"%%s请在 %s 之前提交或贮藏您的修改。"
#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr ""
"您对下列文件的本地修改将被 %s 覆盖:\n"
"%%s"
#: unpack-trees.c:128
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
"更新如下目录将会丢失其中未跟踪的文件:\n"
"%s"
#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
"%%s请在切换分支之前移动或删除。"
#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
"%%s"
#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
"%%s请在合并前移动或删除。"
#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
"%%s"
#: unpack-trees.c:142
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
"%%s请在 %s 前移动或删除。"
#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
"%%s"
#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
"%%s请在切换分支前移动或删除。"
#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%s"
msgstr ""
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
"%%s"
#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr ""
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
"%%s请在合并前移动或删除。"
#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
"%%s"
#: unpack-trees.c:160
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
"%%s请在 %s 前移动或删除。"
#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
"%%s"
#: unpack-trees.c:170
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
"无法更新稀疏检出:如下条目不是最新:\n"
"%s"
#: unpack-trees.c:175
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
"update:\n"
"%s"
msgstr ""
"工作区中下列文件将被稀疏检出更新所覆盖:\n"
"%s"
#: unpack-trees.c:177
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
"update:\n"
"%s"
msgstr ""
"工作区中下列文件将被稀疏检出更新所删除:\n"
"%s"
#: unpack-trees.c:179
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
"无法更新子模组:\n"
"%s"
#: unpack-trees.c:256
#, c-format
msgid "Aborting\n"
msgstr "正在终止\n"
#: unpack-trees.c:318
msgid "Updating files"
msgstr "正在更新文件"
#: unpack-trees.c:350
msgid ""
"the following paths have collided (e.g. case-sensitive paths\n"
"on a case-insensitive filesystem) and only one from the same\n"
"colliding group is in the working tree:\n"
msgstr ""
"以下路径发生碰撞(如:在不区分大小写的文件系统上的区分大小写的路径),\n"
"并且碰撞组中只有一个文件存在工作区中:\n"
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
#, c-format
msgid "invalid %XX escape sequence"
msgstr "无效的 %XX 转义序列"
#: urlmatch.c:215
msgid "missing host and scheme is not 'file:'"
msgstr "缺失主机名且 URL 方案不是 'file:'"
#: urlmatch.c:232
msgid "a 'file:' URL may not have a port number"
msgstr "一个 'file:' URL 不应该包含端口号"
#: urlmatch.c:247
msgid "invalid characters in host name"
msgstr "主机名中包含无效的字符"
#: urlmatch.c:292 urlmatch.c:303
msgid "invalid port number"
msgstr "无效的端口号"
#: urlmatch.c:371
msgid "invalid '..' path segment"
msgstr "无效的 '..' 路径片段"
#: worktree.c:258 builtin/am.c:2095
#, c-format
msgid "failed to read '%s'"
msgstr "读取 '%s' 失败"
#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "在主工作区的 '%s' 不是仓库目录"
#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "文件 '%s' 不包含工作区的绝对路径"
#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' 不存在"
#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' 不是一个 .git 文件,错误码 %d"
#: worktree.c:341
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' 没有指回到 '%s'"
#: wrapper.c:223 wrapper.c:393
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "无法打开 '%s' 进行读写"
#: wrapper.c:424 wrapper.c:624
#, c-format
msgid "unable to access '%s'"
msgstr "不能访问 '%s'"
#: wrapper.c:632
msgid "unable to get current working directory"
msgstr "不能获取当前工作目录"
#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "未合并的路径:"
# 译者:注意保持前导空格
#: wt-status.c:187 wt-status.c:219
msgid " (use \"git restore --staged <file>...\" to unstage)"
msgstr " (使用 \"git restore --staged <文件>...\" 以取消暂存)"
# 译者:注意保持前导空格
#: wt-status.c:190 wt-status.c:222
#, c-format
msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
msgstr " (使用 \"git restore --source=%s --staged <文件>...\" 以取消暂存)"
# 译者:注意保持前导空格
#: wt-status.c:193 wt-status.c:225
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
# 译者:注意保持前导空格
#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
# 译者:注意保持前导空格
#: wt-status.c:199 wt-status.c:203
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
# 译者:注意保持前导空格
#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
#: wt-status.c:211 wt-status.c:1074
msgid "Changes to be committed:"
msgstr "要提交的变更:"
#: wt-status.c:234 wt-status.c:1083
msgid "Changes not staged for commit:"
msgstr "尚未暂存以备提交的变更:"
# 译者:注意保持前导空格
#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
# 译者:注意保持前导空格
#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
# 译者:注意保持前导空格
#: wt-status.c:241
msgid ""
" (use \"git restore <file>...\" to discard changes in working directory)"
msgstr " (使用 \"git restore <文件>...\" 丢弃工作区的改动)"
# 译者:注意保持前导空格
#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
# 译者:注意保持前导空格
#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
#: wt-status.c:268
msgid "both deleted:"
msgstr "双方删除:"
#: wt-status.c:270
msgid "added by us:"
msgstr "由我们添加:"
#: wt-status.c:272
msgid "deleted by them:"
msgstr "由他们删除:"
#: wt-status.c:274
msgid "added by them:"
msgstr "由他们添加:"
#: wt-status.c:276
msgid "deleted by us:"
msgstr "由我们删除:"
#: wt-status.c:278
msgid "both added:"
msgstr "双方添加:"
#: wt-status.c:280
msgid "both modified:"
msgstr "双方修改:"
#: wt-status.c:290
msgid "new file:"
msgstr "新文件:"
#: wt-status.c:292
msgid "copied:"
msgstr "拷贝:"
#: wt-status.c:294
msgid "deleted:"
msgstr "删除:"
#: wt-status.c:296
msgid "modified:"
msgstr "修改:"
#: wt-status.c:298
msgid "renamed:"
msgstr "重命名:"
#: wt-status.c:300
msgid "typechange:"
msgstr "类型变更:"
#: wt-status.c:302
msgid "unknown:"
msgstr "未知:"
#: wt-status.c:304
msgid "unmerged:"
msgstr "未合并:"
# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
#: wt-status.c:384
msgid "new commits, "
msgstr "新提交, "
# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
#: wt-status.c:386
msgid "modified content, "
msgstr "修改的内容, "
# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
#: wt-status.c:388
msgid "untracked content, "
msgstr "未跟踪的内容, "
#: wt-status.c:906
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "您的贮藏区当前有 %d 条记录"
msgstr[1] "您的贮藏区当前有 %d 条记录"
#: wt-status.c:938
msgid "Submodules changed but not updated:"
msgstr "子模组已修改但尚未更新:"
#: wt-status.c:940
msgid "Submodule changes to be committed:"
msgstr "要提交的子模组变更:"
#: wt-status.c:1022
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
msgstr ""
"不要改动或删除上面的一行。\n"
"其下所有内容都将被忽略。"
#: wt-status.c:1114
#, c-format
msgid ""
"\n"
"It took %.2f seconds to compute the branch ahead/behind values.\n"
"You can use '--no-ahead-behind' to avoid this.\n"
msgstr ""
"\n"
"花了 %.2f 秒才计算出分支的领先/落后范围。\n"
"为避免,您可以使用 '--no-ahead-behind'。\n"
#: wt-status.c:1144
msgid "You have unmerged paths."
msgstr "您有尚未合并的路径。"
# 译者:注意保持前导空格
#: wt-status.c:1147
msgid " (fix conflicts and run \"git commit\")"
msgstr " (解决冲突并运行 \"git commit\""
# 译者:注意保持前导空格
#: wt-status.c:1149
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (使用 \"git merge --abort\" 终止合并)"
#: wt-status.c:1153
msgid "All conflicts fixed but you are still merging."
msgstr "所有冲突已解决但您仍处于合并中。"
# 译者:注意保持前导空格
#: wt-status.c:1156
msgid " (use \"git commit\" to conclude merge)"
msgstr " (使用 \"git commit\" 结束合并)"
#: wt-status.c:1165
msgid "You are in the middle of an am session."
msgstr "您正处于 am 操作过程中。"
#: wt-status.c:1168
msgid "The current patch is empty."
msgstr "当前的补丁为空。"
# 译者:注意保持前导空格
#: wt-status.c:1172
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (解决冲突,然后运行 \"git am --continue\""
# 译者:注意保持前导空格
#: wt-status.c:1174
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (使用 \"git am --skip\" 跳过此补丁)"
# 译者:注意保持前导空格
#: wt-status.c:1176
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (使用 \"git am --abort\" 恢复原有分支)"
#: wt-status.c:1309
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo 丢失。"
#: wt-status.c:1311
msgid "No commands done."
msgstr "没有命令被执行。"
#: wt-status.c:1314
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
msgstr[1] "最后的命令已完成(%d 条命令被执行):"
#: wt-status.c:1325
#, c-format
msgid " (see more in file %s)"
msgstr " (更多参见文件 %s"
#: wt-status.c:1330
msgid "No commands remaining."
msgstr "未剩下任何命令。"
#: wt-status.c:1333
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
# 译者:注意保持前导空格
#: wt-status.c:1341
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
#: wt-status.c:1353
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
#: wt-status.c:1358
msgid "You are currently rebasing."
msgstr "您在执行变基操作。"
# 译者:注意保持前导空格
#: wt-status.c:1371
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (解决冲突,然后运行 \"git rebase --continue\""
# 译者:注意保持前导空格
#: wt-status.c:1373
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
# 译者:注意保持前导空格
#: wt-status.c:1375
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
# 译者:注意保持前导空格
#: wt-status.c:1382
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (所有冲突已解决:运行 \"git rebase --continue\""
#: wt-status.c:1386
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
#: wt-status.c:1391
msgid "You are currently splitting a commit during a rebase."
msgstr "您在执行变基操作时拆分提交。"
# 译者:注意保持前导空格
#: wt-status.c:1394
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\""
#: wt-status.c:1398
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
#: wt-status.c:1403
msgid "You are currently editing a commit during a rebase."
msgstr "您在执行变基操作时编辑提交。"
# 译者:注意保持前导空格
#: wt-status.c:1406
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (使用 \"git commit --amend\" 修补当前提交)"
# 译者:注意保持前导空格
#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (当您对您的修改满意后执行 \"git rebase --continue\""
#: wt-status.c:1419
msgid "Cherry-pick currently in progress."
msgstr "拣选操作正在进行中。"
#: wt-status.c:1422
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "您在执行拣选提交 %s 的操作。"
# 译者:注意保持前导空格
#: wt-status.c:1429
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (解决冲突并运行 \"git cherry-pick --continue\""
# 译者:注意保持前导空格
#: wt-status.c:1432
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (执行 \"git cherry-pick --continue\" 以继续)"
# 译者:注意保持前导空格
#: wt-status.c:1435
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\""
# 译者:注意保持前导空格
#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "还原操作正在行中。"
#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您在执行反转提交 %s 的操作。"
# 译者:注意保持前导空格
#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (解决冲突并执行 \"git revert --continue\""
# 译者:注意保持前导空格
#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (执行 \"git revert --continue\" 以继续)"
# 译者:注意保持前导空格
#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (所有冲突已解决:执行 \"git revert --continue\""
# 译者:注意保持前导空格
#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "您在执行二分查找操作。"
# 译者:注意保持前导空格
#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
#: wt-status.c:1690
msgid "On branch "
msgstr "位于分支 "
#: wt-status.c:1697
msgid "interactive rebase in progress; onto "
msgstr "交互式变基操作正在进行中;至 "
#: wt-status.c:1699
msgid "rebase in progress; onto "
msgstr "变基操作正在进行中;至 "
#: wt-status.c:1709
msgid "Not currently on any branch."
msgstr "当前不在任何分支上。"
#: wt-status.c:1726
msgid "Initial commit"
msgstr "初始提交"
#: wt-status.c:1727
msgid "No commits yet"
msgstr "尚无提交"
#: wt-status.c:1741
msgid "Untracked files"
msgstr "未跟踪的文件"
#: wt-status.c:1743
msgid "Ignored files"
msgstr "忽略的文件"
#: wt-status.c:1747
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"may speed it up, but you have to be careful not to forget to add\n"
"new files yourself (see 'git help status')."
msgstr ""
"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
"但您需要小心不要忘了添加新文件(参见 'git help status')。"
#: wt-status.c:1753
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"
# 译者:中文字符串拼接,可删除前导空格
#: wt-status.c:1755
msgid " (use -u option to show untracked files)"
msgstr "(使用 -u 参数显示未跟踪的文件)"
#: wt-status.c:1761
msgid "No changes"
msgstr "没有修改"
#: wt-status.c:1766
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\"\n"
#: wt-status.c:1769
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交\n"
#: wt-status.c:1772
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
#: wt-status.c:1775
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "提交为空,但是存在尚未跟踪的文件\n"
# 译者:中文字符串拼接,可删除前导空格
#: wt-status.c:1778
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
#: wt-status.c:1781 wt-status.c:1786
#, c-format
msgid "nothing to commit\n"
msgstr "无文件要提交\n"
# 译者:中文字符串拼接,可删除前导空格
#: wt-status.c:1784
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
# 译者:中文字符串拼接,可删除前导空格
#: wt-status.c:1788
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "无文件要提交,干净的工作区\n"
#: wt-status.c:1901
msgid "No commits yet on "
msgstr "尚无提交在 "
#: wt-status.c:1905
msgid "HEAD (no branch)"
msgstr "HEAD非分支"
#: wt-status.c:1936
msgid "different"
msgstr "不同"
# 译者:注意保持句尾空格
#: wt-status.c:1938 wt-status.c:1946
msgid "behind "
msgstr "落后 "
#: wt-status.c:1941 wt-status.c:1944
msgid "ahead "
msgstr "领先 "
#. TRANSLATORS: the action is e.g. "pull with rebase"
#: wt-status.c:2466
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "不能%s您有未暂存的变更。"
#: wt-status.c:2472
msgid "additionally, your index contains uncommitted changes."
msgstr "另外,您的索引中包含未提交的变更。"
#: wt-status.c:2474
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s您的索引中包含未提交的变更。"
#: builtin/add.c:25
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<选项>] [--] <路径规格>..."
#: builtin/add.c:84
#, c-format
msgid "unexpected diff status %c"
msgstr "意外的差异状态 %c"
#: builtin/add.c:89 builtin/commit.c:288
msgid "updating files failed"
msgstr "更新文件失败"
#: builtin/add.c:99
#, c-format
msgid "remove '%s'\n"
msgstr "删除 '%s'\n"
#: builtin/add.c:174
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更:"
#: builtin/add.c:234 builtin/rev-parse.c:896
msgid "Could not read the index"
msgstr "不能读取索引"
#: builtin/add.c:245
#, c-format
msgid "Could not open '%s' for writing."
msgstr "无法为写入打开 '%s'。"
#: builtin/add.c:249
msgid "Could not write patch"
msgstr "不能生成补丁"
#: builtin/add.c:252
msgid "editing patch failed"
msgstr "编辑补丁失败"
#: builtin/add.c:255
#, c-format
msgid "Could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
#: builtin/add.c:257
msgid "Empty patch. Aborted."
msgstr "空补丁。异常终止。"
#: builtin/add.c:262
#, c-format
msgid "Could not apply '%s'"
msgstr "不能应用 '%s'"
#: builtin/add.c:270
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
msgid "dry run"
msgstr "演习"
#: builtin/add.c:293
msgid "interactive picking"
msgstr "交互式拣选"
#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
#: builtin/add.c:295
msgid "edit current diff and apply"
msgstr "编辑当前差异并应用"
#: builtin/add.c:296
msgid "allow adding otherwise ignored files"
msgstr "允许添加忽略的文件"
#: builtin/add.c:297
msgid "update tracked files"
msgstr "更新已跟踪的文件"
#: builtin/add.c:298
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "对已跟踪文件(暗含 -u重新归一换行符"
#: builtin/add.c:299
msgid "record only the fact that the path will be added later"
msgstr "只记录,该路径稍后再添加"
#: builtin/add.c:300
msgid "add changes from all tracked and untracked files"
msgstr "添加所有改变的已跟踪文件和未跟踪文件"
#: builtin/add.c:303
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
#: builtin/add.c:305
msgid "don't add, only refresh the index"
msgstr "不添加,只刷新索引"
#: builtin/add.c:306
msgid "just skip files which cannot be added because of errors"
msgstr "跳过因出错不能添加的文件"
#: builtin/add.c:307
msgid "check if - even missing - files are ignored in dry run"
msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
#: builtin/add.c:309 builtin/update-index.c:1001
msgid "override the executable bit of the listed files"
msgstr "覆盖列表里文件的可执行位"
#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "创建一个嵌入式仓库时给予警告"
#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
"Clones of the outer repository will not contain the contents of\n"
"the embedded repository and will not know how to obtain it.\n"
"If you meant to add a submodule, use:\n"
"\n"
"\tgit submodule add <url> %s\n"
"\n"
"If you added this path by mistake, you can remove it from the\n"
"index with:\n"
"\n"
"\tgit rm --cached %s\n"
"\n"
"See \"git help submodule\" for more information."
msgstr ""
"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容并"
"且不知道该如何获取它。\n"
"如果您要添加一个子模组,使用:\n"
"\n"
"\tgit submodule add <url> %s\n"
"\n"
"如果您不小心添加了这个路径,可以用下面的命令将其从索引中删除:\n"
"\n"
"\tgit rm --cached %s\n"
"\n"
"参见 \"git help submodule\" 获取更多信息。"
#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "正在添加嵌入式 git 仓库:%s"
#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "使用 -f 参数如果您确实要添加它们。\n"
#: builtin/add.c:379
msgid "adding files failed"
msgstr "添加文件失败"
#: builtin/add.c:419
msgid "-A and -u are mutually incompatible"
msgstr "-A 和 -u 选项互斥"
#: builtin/add.c:426
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
#: builtin/add.c:430
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
#: builtin/add.c:445
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "没有指定文件,也没有文件被添加。\n"
#: builtin/add.c:446
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "也许您想要执行 'git add .'\n"
#: builtin/am.c:348
msgid "could not parse author script"
msgstr "不能解析作者脚本"
#: builtin/am.c:432
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 钩子删除"
#: builtin/am.c:474
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的输入行:'%s'。"
#: builtin/am.c:512
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
#: builtin/am.c:538
msgid "fseek failed"
msgstr "fseek 失败"
#: builtin/am.c:726
#, c-format
msgid "could not parse patch '%s'"
msgstr "无法解析补丁 '%s'"
#: builtin/am.c:791
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"
#: builtin/am.c:839
msgid "invalid timestamp"
msgstr "无效的时间戳"
#: builtin/am.c:844 builtin/am.c:856
msgid "invalid Date line"
msgstr "无效的日期行"
#: builtin/am.c:851
msgid "invalid timezone offset"
msgstr "无效的时区偏移值"
#: builtin/am.c:944
msgid "Patch format detection failed."
msgstr "补丁格式探测失败。"
#: builtin/am.c:949 builtin/clone.c:407
#, c-format
msgid "failed to create directory '%s'"
msgstr "创建目录 '%s' 失败"
#: builtin/am.c:954
msgid "Failed to split patches."
msgstr "拆分补丁失败。"
#: builtin/am.c:1084 builtin/commit.c:374
msgid "unable to write index file"
msgstr "无法写入索引文件"
#: builtin/am.c:1098
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题,执行 \"%s --continue\"。"
#: builtin/am.c:1099
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
#: builtin/am.c:1100
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
#: builtin/am.c:1183
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
msgstr "补丁使用 format=flowed 格式发送,行尾的空格可能会丢失。"
#: builtin/am.c:1211
msgid "Patch is empty."
msgstr "补丁为空。"
#: builtin/am.c:1277
#, c-format
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96 af6b65d45e Git 2.26.2 7397ca3373 Git 2.25.4 b86a4be245 Git 2.24.3 f2771efd07 Git 2.23.3 c9808fa014 Git 2.22.4 9206d27eb5 Git 2.21.3 041bc65923 Git 2.20.4 76b54ee9b9 Git 2.19.5 ba6f0905fd Git 2.18.4 df5be6dc3f Git 2.17.5 1a3609e402 fsck: reject URL with empty host in .gitmodules e7fab62b73 credential: treat URL with empty scheme as invalid c44088ecc4 credential: treat URL without scheme as invalid fe29a9b7b0 credential: die() when parsing invalid urls a2b26ffb1a fsck: convert gitmodules url to URL passed to curl 8ba8ed568e credential: refuse to operate when missing host or protocol 24036686c4 credential: parse URL without host as empty host, not unset 73aafe9bc2 t0300: use more realistic inputs a88dbd2f8c t0300: make "quit" helper more realistic de49261b05 Git 2.26.1 274b9cc253 Git 2.26 55a7568606 Merge branch 'en/rebase-backend' c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git 1557364fb4 l10n: tr.po: change file mode to 644 2da1b05674 t3419: prevent failure when run with EXPENSIVE 1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0 5804c6ec40 l10n: de.po: add missing space 98cedd0233 Merge https://github.com/prati0100/git-gui 4914ba4bcf l10n: tr: Fix a couple of ambiguities a5728022e0 Merge branch 'py/remove-tcloo' 7fcb965970 RelNotes/2.26.0: fix various typos f0c03bcf95 l10n: Update Catalan translation 67b0a24910 Git 2.25.3 be8661a328 Sync with Git 2.25.2 0822e66b5d Git 2.25.2 65588b0b2e unicode: update the width tables to Unicode 13.0 7be274b0ff Merge branch 'js/ci-windows-update' into maint 9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint 221887a492 Merge branch 'jk/doc-credential-helper' into maint 32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint 618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint 50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint 41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint 2d7247af6f Merge branch 'am/mingw-poll-fix' into maint 4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint 76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint 569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint 16a4bf1035 Merge branch 'en/check-ignore' into maint 3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint 56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint 1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint 7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint 93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint 758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint 506223f9c5 Git 2.24.2 17a02783d8 Git 2.23.2 69fab82147 Git 2.22.3 fe22686494 Git 2.21.2 d1259ce117 Git 2.20.3 a5979d7009 Git 2.19.4 21a3e5016b Git 2.18.3 c42c0f1297 Git 2.17.4 d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u) 3891a84ccd git-gui: create a new namespace for chord script evaluation 8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5 440e7442d1 l10n: zh_CN: Revise v2.26.0 translation 2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2 6c85aac65f Git 2.26-rc2 74f172e39e Merge branch 'en/test-cleanup' e96327c947 Merge branch 'es/outside-repo-errmsg-hints' ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0 15fa8d9667 l10n: vi: fix translation + grammar 5c20398699 prefix_path: show gitdir if worktree unavailable 1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated) c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated) a4a2f64642 Merge branch 'js/askpass-coerce-utf8' 850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows d769dcc5cd Merge branch 'py/blame-status-error' 70e24186c0 t6022, t6046: fix flaky files-are-updated checks 30e9940356 Hopefully the final batch before -rc2 b4f0038525 Merge branch 'en/rebase-backend' 25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master 07259e74ec fsck: detect gitmodules URLs with embedded newlines c716fe4bd9 credential: detect unrepresentable values when parsing urls 17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr 9a6bbee800 credential: avoid writing values with newlines 17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2 1afe18a3bb l10n: es: 2.26.0 round#2 5ab9217a3c Merge branch of github.com:alshopov/git-po into master c6713676d6 Merge branch of github.com:bitigchi/git-po into master b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t) 2713dec02d l10n: tr: v2.26.0 round 2 c9ef57cc3a l10n: fr : v2.26.0 rnd 2 120b1eb731 git-rebase.txt: highlight backend differences with commit rewording 9a1b7474d6 sequencer: clear state upon dropping a become-empty commit 937d143630 i18n: unmark a message in rebase.c a56d361f66 Merge branch 'ds/sparse-add' 5fa9169ced Merge branch 'dr/push-remote-ref-update' cdef998b46 Merge branch 'jc/doc-single-h-is-for-help' 051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed) 52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master 9643441983 l10n: tr: Add glossary for Turkish translations 438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git 2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u) dd2c269652 l10n: tr: Add Turkish translations 8f4f099f8b l10n: tr: Add Turkish translation team info b4374e96c8 Git 2.26-rc1 4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch' 3658d77f8e Merge branch 'hd/show-one-mergetag-fix' 6125104b88 Merge branch 'rt/format-zero-length-fix' 1ac37deba2 Merge branch 'am/mingw-poll-fix' cf372dc815 Merge branch 'en/test-cleanup' d1075adfdf Merge branch 'en/merge-path-collision' a4fd114ffc Merge branch 'kk/complete-diff-color-moved' a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file' 0e0d717537 Merge branch 'pb/am-show-current-patch' 9b7f726dfc Merge branch 'am/pathspec-f-f-more' 4605a73073 t1091: don't grep for `strerror()` string 4d9c2902a1 l10n: fr v2.26.0 rnd1 ad182bee3f Merge branch of github.com:alshopov/git-po into master 23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1 98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t) f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed) 76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po 076cbdcd73 Git 2.26-rc0 0d65f3fb1a t5537: adjust test_oid label e63cefb024 Merge branch 'hi/gpg-use-check-signature' 5da7329e29 Merge branch 'rs/commit-graph-code-simplification' 0108fc1b46 Merge branch 'js/ci-windows-update' f3ccd9f0d9 Merge branch 'be/describe-multiroot' a6b4709302 Merge branch 'ag/rebase-remove-redundant-code' b22db265d6 Merge branch 'es/recursive-single-branch-clone' e8e71848ea Merge branch 'jk/nth-packed-object-id' a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch' 4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere' 49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix' 2cbb058669 Merge branch 'bc/wildcard-credential' 25063e2530 Merge branch 'mr/bisect-in-c-1' f4d7dfce4d Merge branch 'ds/sparse-add' 4d864895a2 t2402: test worktree path when called in .git directory af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch() 7655b4119d remote-curl: show progress for fetches over dumb HTTP 2f268890c2 The eighth batch for 2.26 aa5a7e02ad Merge branch 'ma/test-cleanup' 58595e713c Merge branch 'rs/blame-typefix-for-fingerprint' ff41848e99 Merge branch 'rs/micro-cleanups' 4cbf1a0e22 Merge branch 'es/worktree-cleanup' 46703057c1 Merge branch 'ak/test-log-graph' 777815f5f9 Merge branch 'jk/run-command-formatfix' 444cff61b4 Merge branch 'ds/partial-clone-fixes' 48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure' 8c22bd9ff9 Merge branch 'en/rebase-backend' cb2f5a8e97 Merge branch 'en/check-ignore' 0df82d99da Merge branch 'jk/object-filter-with-bitmap' 80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix' 29b09c518c Merge branch 'jk/doc-diff-parallel' 237a28173f show_one_mergetag: print non-parent in hex form. 5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context" 6d1210e133 l10n: Update Catalan translation 0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification" 7329d94be7 config.mak.dev: re-enable -Wformat-zero-length 7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings 94f4d01932 mingw: workaround for hangs when sending STDIN 1ff466c018 Documentation: clarify that `-h` alone stands for `help` 65bf820d0e t6020: new test with interleaved lexicographic ordering of directories 9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it d5bb92eced t3035: prefer test_must_fail to bash negation for git commands b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions 42d180dd01 t602[1236], t6034: modernize test formatting 802050400a merge-recursive: apply collision handling unification to recursive case 7f487ce062 Azure Pipeline: switch to the latest agent pools 5ed9fc3fc8 ci: prevent `perforce` from being quarantined eafff6e41e t/lib-httpd: avoid using macOS' sed d68ce906c7 commit-graph: use progress title directly 30b1c7ad9d describe: don't abort too early when searching tags 240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to' 2d2118b814 The seventh batch for 2.26 325eb66830 Merge branch 'es/doc-mentoring' 87f17d790d Merge branch 'es/bright-colors' d0038f4b31 Merge branch 'bw/remote-rename-update-config' 132f600b06 clone: pass --single-branch during --recurse-submodules 47319576f1 submodule--helper: use C99 named initializer ffe005576a lib-log-graph: consolidate colored graph cmp logic 989eea958b lib-log-graph: consolidate test_cmp_graph logic bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching bb4995fc3f worktree: add utility to find worktree by pathname a80c4c2214 worktree: improve find_worktree() documentation 2fecc48cad packfile: drop nth_packed_object_sha1() 6ac9760a30 packed_object_info(): use object_id internally for delta base b99b6bcc57 packed_object_info(): use object_id for returning delta base 63f4a7fc01 pack-check: push oid lookup into loop e31c71083a pack-check: convert "internal error" die to a BUG() 500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps f66d4e0250 pack-objects: use object_id struct in pack-reuse code a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id 3f83fd5e44 pack-objects: read delta base oid into object_id struct 0763671b8e nth_packed_object_oid(): use customary integer return 02bbbe9df9 worktree: drop unused code from get_main_worktree() 27f182b3fc blame: provide type of fingerprints pointer b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere df126ca142 t3400: make test clean up after itself 3c29e21eb0 t: drop debug `cat` calls cac439b56d t9810: drop debug `cat` call 91de82adc9 t4117: check for files using `test_path_is_file` 4ef346482d receive.denyCurrentBranch: respect all worktrees f8692114db t5509: use a bare repository for test push target 45f274fbb1 get_main_worktree(): allow it to be called in the Git directory fd0bc17557 completion: add diff --color-moved[-ws] 2ce6d075fa use strpbrk(3) to search for characters from a given set 2b3c430bce quote: use isalnum() to check for alphanumeric characters a51d9e8f07 t1050: replace test -f with test_path_is_file 3e96c66805 partial-clone: avoid fetching when looking for objects d0badf8797 partial-clone: demonstrate bugs in partial fetch 539052f42f run-command.h: fix mis-indented struct member 6c11c6a124 sparse-checkout: allow one-character directories in cone mode aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch e8ef1e8d6e am: convert "resume" variable to a struct bc8620b440 parse-options: convert "command mode" to a flag 62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE() 46fd7b3900 credential: allow wildcard patterns when matching config 82eb249853 credential: use the last matching username in the config 588c70e10f t0300: add tests for some additional cases 732f934408 t1300: add test for urlmatch with multiple wildcards 3fa0e04667 mailmap: add an additional email address for brian m. carlson 8a98758a8d stash push: support the --pathspec-from-file option 8c3713cede stash: eliminate crude option parsing 3f3d8068f5 doc: stash: synchronize <pathspec> description b22909144c doc: stash: document more options 0093abc286 doc: stash: split options from description (2) 2b7460d167 doc: stash: split options from description (1) 5f393dc3aa rm: support the --pathspec-from-file option fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags 73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure 6c69f22233 bisect: libify `bisect_next_all` 9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents 45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents e8e3ce6718 bisect: libify `bisect_checkout` ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents 7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()` 680e8a01e5 bisect: add enum to represent bisect returning codes bfacfce7d9 bisect--helper: introduce new `decide_next()` function b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0 292731c4c2 bisect--helper: change `retval` to `res` 16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays 7ec8125fba check-ignore: fix documentation and implementation to match 2607d39da3 doc-diff: use single-colon rule in rendering Makefile 0aa6ce3094 doc/config/push: use longer "--" line for preformatted example 20a5fd881a rev-list --count: comment on the use of count_right++ 63a58457e0 Merge branch 'py/missing-bracket' 51ebf55b93 The sixth batch for 2.26 f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints' 123538444f Merge branch 'jk/doc-credential-helper' e154451a2f Merge branch 'js/mingw-open-in-gdb' fc25a19265 Merge branch 'js/test-unc-fetch' 6365058605 Merge branch 'js/test-avoid-pipe' 966b69f02f Merge branch 'js/test-write-junit-xml-fix' d880c3de23 Merge branch 'jk/mailinfo-cleanup' 5d55554b1d Merge branch 'mr/show-config-scope' 9f3f38769d Merge branch 'rs/strbuf-insertstr' cbecc168d4 Merge branch 'rs/parse-options-concat-dup' 5af345a438 Merge branch 'bc/hash-independent-tests-part-8' 0460c109c3 Merge branch 'rs/name-rev-memsave' 6b9919c0a2 git-gui: add missing close bracket 5897e5ac96 Merge branch 'cs/german-translation' cf85a32eb6 git-gui: update German translation 5096e51c54 git-gui: extend translation glossary template with more terms 8b85bb1b70 git-gui: update pot template and German translation to current source code e68e29171c Sync with 2.25.1 c522f061d5 Git 2.25.1 10cdb9f38a rebase: rename the two primary rebase backends 2ac0d6273f rebase: change the default backend from "am" to "merge" 8295ed690b rebase: make the backend configurable via config setting 76340c8107 rebase tests: repeat some tests using the merge backend instead of am 980b482d28 rebase tests: mark tests specific to the am-backend with --am c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases 6d04ce75c4 git-prompt: change the prompt for interactive-based rebases 52eb738d6b rebase: add an --am option 8af14f0859 rebase: move incompatibility checks between backend options a bit earlier be50c938df git-rebase.txt: add more details about behavioral differences of backends befb89ce7c rebase: allow more types of rebases to fast-forward 9a70f3d4ae t3432: make these tests work with either am or merge backends 93122c985a rebase: fix handling of restrict_revision 55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer 8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling 7db00f0b3b t3406: simplify an already simple test e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty d48e5e21da rebase (interactive-backend): make --keep-empty the default e0020b2f82 prefix_path: show gitdir when arg is outside repo cc4f2eb828 doc: move credential helper info into gitcredentials(7) bfdd66e72f Sync with maint 7ae7e234c7 The fifth batch for 2.26 53c3be2c29 Merge branch 'tb/commit-graph-object-dir' 7b029ebaef Merge branch 'jk/index-pack-dupfix' aa21cc97bd Merge branch 'jk/alloc-cleanups' 883326077a Merge branch 'jh/notes-fanout-fix' f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule' 78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs' df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing' 433b8aac2e Merge branch 'ds/sparse-checkout-harden' 4a77434bc8 Merge branch 'ld/p4-cleanup-processes' 8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone' 09e48400a3 Merge branch 'jk/get-oid-error-message-i18n' 4dbeecba27 Merge branch 'ag/edit-todo-drop-check' f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2' d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout' 251187084d Merge branch 'js/rebase-i-with-colliding-hash' c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix' 56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store' 0da63da794 Merge branch 'jn/promote-proto2-to-default' a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup' daef1b300b Merge branch 'hw/advice-add-nothing' 6141e0cc00 Merge branch 'js/convert-typofix' into maint 4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint 5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint 7137d6089b Merge branch 'ms/doc-bundle-format' into maint 52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint 0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint 1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint 153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint 8857657cc9 Merge branch 'jt/t5616-robustify' into maint 1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint f468972671 Merge branch 'bc/misconception-doc' into maint 6e69042e26 Merge branch 'bc/author-committer-doc' into maint 650ed395be Merge branch 'ds/refmap-doc' into maint 80b806f1a8 Merge branch 'bc/actualmente' into maint eceff4ba12 Merge branch 'rt/submodule-i18n' into maint 8a17eb7972 Merge branch 'jk/test-fixes' into maint 54bbadaeca Merge branch 'jk/asan-build-fix' into maint 8dbeba198e Merge branch 'ds/sparse-cone' into maint e361f36f61 Merge branch 'nd/switch-and-restore' into maint 4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint 5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint 9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint 3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint 3ab3185f99 pack-objects: support filters with bitmaps 84243da129 pack-bitmap: implement BLOB_LIMIT filtering 4f3bd5606a pack-bitmap: implement BLOB_NONE filtering cc4aa28506 bitmap: add bitmap_unset() function 2aaeb9ac41 rev-list: use bitmap filters for traversal 6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure 4eb707ebd6 rev-list: allow commit-only bitmap traversals ea047a8eb4 t5310: factor out bitmap traversal comparison 608d9c9365 rev-list: allow bitmaps when counting objects 55cb10f9b5 rev-list: make --count work with --objects 792f811998 rev-list: factor out bitmap-optimized routines d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs 08809c09aa mingw: add a helper function to attach GDB to the current process bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths de26f02db1 t9001, t9116: avoid pipes a2dc43414c MyFirstContribution: rephrase contact info e03f928e2a rev-list: fallback to non-bitmap traversal when filtering acac50dd8c pack-bitmap: fix leak of haves/wants object lists 551cf8b655 pack-bitmap: factor out type iterator initialization d8437c57fa The fourth batch for 2.26 a3dcf84df0 Merge branch 'js/convert-typofix' 0de2d1409b Merge branch 'js/ci-squelch-doc-warning' 0410c2ba31 Merge branch 'jb/multi-pack-index-docfix' 0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example' e99c325bb4 Merge branch 'ms/doc-bundle-format' afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix' db72f8c940 Merge branch 'jb/parse-options-message-fix' 3d2471ba85 Merge branch 'ma/filter-branch-doc-caret' b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path' 44cba9c4b3 Merge branch 'jc/skip-prefix' 556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index' 17e4a1b141 Merge branch 'hw/doc-git-dir' 4cf7f48891 Merge branch 'jk/push-default-doc' b783391018 Merge branch 'jk/clang-sanitizer-fixes' a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache' 3f7553acf5 Merge branch 'jt/t5616-robustify' 341f8a6476 Merge branch 'jk/escaped-wildcard-dwim' b486d2ee81 Merge branch 'jn/pretend-object-doc' 076ee3e8a2 tests: fix --write-junit-xml with subshells 2b0f19fa7a convert: fix typo c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors 1751b09a92 color.c: support bright aixterm colors 4a28eb0ae4 color.c: refactor color_output arguments f696a2b1c8 mailinfo: factor out some repeated header handling ffbea1816d mailinfo: be more liberal with header whitespace f447d0293e mailinfo: simplify parsing of header values b6537d83ee mailinfo: treat header values as C strings ef07659926 sparse-checkout: work with Windows paths 2631dc879d sparse-checkout: create 'add' subcommand 4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand 6fb705abcb sparse-checkout: extract add_patterns_from_input() b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config f2a2327a4a config: provide access to the current line number 923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values ceff1a1308 remote: clean-up config callback 1a83068c26 remote: clean-up by returning early to avoid one indentation 88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types 145d59f482 config: add '--show-scope' to print the scope of a config value 9a83d088ee submodule-config: add subomdule config scope e37efa40e1 config: teach git_config_source to remember its scope 5c105a842e config: preserve scope in do_git_config_sequence 6766e41b8a config: clarify meaning of command line scoping 6dc905d974 config: split repo scope to local and worktree a5cb4204b6 config: make scope_name non-static and rename it 30183894ea ci: ignore rubygems warning in the "Documentation" job 7a9f8ca805 parse-options: simplify parse_options_dup() c84078573e parse-options: const parse_options_concat() parameters f904f9025f parse-options: factor out parse_options_count() a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat() 517b60564e mailinfo: don't insert header prefix for handle_content_type() a91cc7fad0 strbuf: add and use strbuf_insertstr() eb31044ff7 pack-format: correct multi-pack-index description 9299f84921 diff-options.txt: avoid "regex" overload in example 7378ec90e1 doc: describe Git bundle format f3037657e8 t6024: update for SHA-256 edf04243b2 t6006: make hash size independent 5db24dcffd t6000: abstract away SHA-1-specific constants d341e0805d t5703: make test work with SHA-256 88ed241a7e t5607: make hash size independent 48c10cc0e6 t5318: update for SHA-256 f7ae8e69b6 t5515: make test hash independent e70649bb66 t5321: make test hash independent a30f93b143 t5313: make test hash independent a79eec220b t5309: make test hash independent 796d1383a3 t5302: make hash size independent 417e45e5e3 t4060: make test work with SHA-256 dfa5f53e78 t4211: add test cases for SHA-256 f743e8f5b3 t4211: move SHA-1-specific test cases into a directory 72f936b120 t4013: make test hash independent 5df0f11f07 t3311: make test work with SHA-256 07877f393c t3310: make test work with SHA-256 6025e898d6 t3309: make test work with SHA-256 7b1a1822fe t3308: make test work with SHA-256 94db7e3e93 t3206: make hash size independent db12505c2c t/lib-pack: support SHA-256 303b3c1c46 submodule: add newline on invalid submodule error 887a0fd573 add: change advice config variables used by the add API de93cc14ab The third batch for 2.26 ea46d9097b Merge branch 'mt/sparse-checkout-doc-update' ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix' b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend' 7ab963e122 Merge branch 'en/fill-directory-fixes-more' f52ab33616 Merge branch 'bc/hash-independent-tests-part-7' 25794d6ce9 Merge branch 'km/submodule-add-errmsg' d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity' 76c57fedfa Merge branch 'js/add-p-leftover-bits' 9a5315edfd Merge branch 'js/patch-mode-in-others-in-c' 381e8e9de1 Merge branch 'dl/test-must-fail-fixes' 395518cf7a parse-options: lose an unnecessary space in an error message 079f970971 name-rev: sort tip names before applying 2d53975488 name-rev: release unused name strings 977dc1912b name-rev: generate name strings only if they are better 1c56fc2084 name-rev: pre-size buffer in get_parent_name() ddc42ec786 name-rev: factor out get_parent_name() f13ca7cef5 name-rev: put struct rev_name into commit slab d689d6d82f name-rev: don't _peek() in create_or_update_name() 15a4205d96 name-rev: don't leak path copy in name_ref() 36d2419c9a name-rev: respect const qualifier 71620ca86c name-rev: remove unused typedef 3e2feb0d64 name-rev: rewrite create_or_update_name() a21781011f index-pack: downgrade twice-resolved REF_DELTA to die() dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout e1c5253951 t3305: check notes fanout more carefully and robustly e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st' ad2dd5bb63 commit-graph.c: remove path normalization, comparison 13c2499249 commit-graph.h: store object directory in 'struct commit_graph' 0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context' f38c92452d t7400: testcase for submodule status on unregistered inner git repos 5290d45134 tree-walk.c: break circular dependency with unpack-trees f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode e53ffe2704 sparse-checkout: escape all glob characters on write e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand bd64de42de sparse-checkout: unquote C-style strings over --stdin d585f0e799 sparse-checkout: write escaped patterns in cone mode 4f52c2ce6c sparse-checkout: properly match escaped characters 9abc60f801 sparse-checkout: warn on globs in cone patterns 145136a95a C: use skip_prefix() to avoid hardcoded string length 04e5b3f0b4 submodule foreach: replace $path with $sm_path in example 1793280e91 t5318: don't pass non-object directory to '--object-dir' da8063522f diff: move diff.wsErrorHighlight to "basic" config b98d188581 sha1-file: allow check_object_signature() to handle any repo 2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file() 7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare() c8123e72f6 streaming: allow open_istream() to handle any repo 5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile() a651946730 cache-tree: use given repo's hash_algo at verify_one() eb999b3295 diff: make diff_populate_filespec() honor its repo argument 5b0ca878e0 Sync with maint 344ee18728 The second batch 53a83299c7 Merge branch 'bc/misconception-doc' c9ccf9d09b Merge branch 'bc/author-committer-doc' 0d0fa20c40 Merge branch 'ss/t6025-modernize' 7050624abc Merge branch 'lh/bool-to-type-bool' 4b69f29271 Merge branch 'ds/refmap-doc' aff812ce3c Merge branch 'bc/actualmente' 38fb56e92a Merge branch 'rt/submodule-i18n' f0940743fa Merge branch 'js/builtin-add-i-cmds' 0afeb3fdf4 Merge branch 'jk/test-fixes' 808dab2b58 Merge branch 'jk/asan-build-fix' fec1ff97c2 Merge branch 'sg/completion-worktree' c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function' 11ad30b887 Merge branch 'hi/gpg-mintrustlevel' 96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases' d52adee779 Merge branch 'ds/graph-horizontal-edges' 6909474491 Merge branch 'am/update-pathspec-f-f-tests' 043426c8fd Merge branch 'ds/sparse-cone' 34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig' 8dd40c0472 traverse_trees(): use stack array for name entries 667b76ec58 walker_fetch(): avoid raw array length computation 9734b74a8f normalize_path_copy(): document "dst" size expectations 43f33e492a git-p4: avoid leak of file handle when cloning 19fa5ac333 git-p4: check for access to remote host earlier 6026aff5bb git-p4: cleanup better on error exit ca5b5cce62 git-p4: create helper function importRevisions() 4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable 5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce 837b3a6376 git-p4: make closeStreams() idempotent b0418303b1 sha1-name: mark get_oid() error messages for translation 2df1aa239c fetch: forgo full connectivity check if --filter 50033772d5 connected: verify promisor-ness of partial clone d82ad54945 git: update documentation for --git-dir 0ad7144999 .mailmap: map Yi-Jyun Pan's email c56c48dd07 grep: ignore --recurse-submodules if --no-index is given 8b2a1928f0 doc: drop "explicitly given" from push.default description cf82bff73f obstack: avoid computing offsets from NULL pointer 3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer d20bc01a51 avoid computing zero offsets from NULL pointer 7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero bc3f657f71 t1506: drop space after redirection operator e5d7b2f65c t1400: avoid "test" string comparisons 5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo' 1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c c7a6207591 Sync with maint 7210ca4ee5 .mailmap: fix GGG authoship screwup 37a63faae5 t4124: only mark git command with test_must_fail a8c663cf65 t3507: use test_path_is_missing() 2def7f017c t3507: fix indentation e8a1c686ae t3504: do check for conflict marker after failed cherry-pick 1c9fd32fd2 t3419: stop losing return code of git command c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}() a781cd6fef t3415: stop losing return codes of git commands 86ce6e0dd1 t3310: extract common notes_merge_files_gone() 245b9ba0ba t3030: use test_path_is_missing() 4a6f11fd7b t2018: replace "sha" with "oid" 62e80fcb48 t2018: don't lose return code of git commands 30c0367668 t2018: teach do_checkout() to accept `!` arg 40caa5366a t2018: be more discerning when checking for expected exit codes b54128bb0b t5616: make robust to delta base change 4c616c2ba1 merge-recursive: use subtraction to flip stage ee798742bd merge-recursive: silence -Wxor-used-as-pow warning 39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin 3b2885ec9b submodule: fix status of initialized but not cloned submodules ace912bfb8 t7400: add a testcase for submodule status on empty dirs 4bb4fd4290 MyFirstContribution: add avenues for getting help 9e6d3e6417 sparse-checkout: detect short patterns 41de0c6fbc sparse-checkout: cone mode does not recognize "**" 7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone 47dbf10d8a clone: fix --sparse option with URLs 3c754067a1 sparse-checkout: create leading directories d622c34396 t1091: improve here-docs 522e641748 t1091: use check_files to reduce boilerplate 417be08d02 t1300: create custom config file without special characters 3de7ee369b t1300: fix over-indented HERE-DOCs 329e6ec397 config: fix typo in variable name 767a9c417e rebase -i: stop checking out the tip of the branch to rebase dfaed02862 fsmonitor: update documentation for hook version and watchman hooks e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2 d031049da3 completion: add support for sparse-checkout a402723e48 doc: sparse-checkout: mention --cone option 26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck b6992261de rebase -i: re-fix short SHA-1 collision d859dcad94 parse_insn_line(): improve error message when parsing failed d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects 92fb0db94c pack-objects: add checks for duplicate objects bb514de356 pack-objects: improve partial packfile reuse ff483026a9 builtin/pack-objects: introduce obj_is_packed() e704fc7978 pack-objects: introduce pack.allowPackReuse 2f4af77699 csum-file: introduce hashfile_total() 8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting() 59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile 40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains() 14fbd26044 ewah/bitmap: introduce bitmap_word_alloc() bc7a3d4dc0 The first batch post 2.25 cycle 09e393d913 Merge branch 'nd/switch-and-restore' 45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' 0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout' 36da2a8635 Merge branch 'es/unpack-trees-oob-fix' 42096c778d Merge branch 'bc/run-command-nullness-after-free-fix' 1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted' a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees' e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached' 9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting' 237a83a943 Merge branch 'dl/credential-netrc' a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir() 129510a067 t2405: clarify test descriptions and simplify test 4eaadc8493 t2405: use git -C and test_commit -C instead of subshells 773c60a45e t7410: rename to t2405-worktree-submodule.sh 7a2dc95cbc docs: mention when increasing http.postBuffer is valuable 1b13e9032f doc: dissuade users from trying to ignore tracked files 69e104d70e doc: provide guidance on user.name format 813f6025a5 docs: expand on possible and recommended user config options bc94e5862a doc: move author and committer information to git-commit(1) 7979dfe1d4 l10n: Update Catalan translation 81e3db42f3 templates: fix deprecated type option `--bool` c513a958b6 t6025: use helpers to replace test -f <path> 70789843bd t6025: modernize style 6a7aca6f01 doc: rm: synchronize <pathspec> description 856249c62a docs: use "currently" for the present time b40a50264a fetch: document and test --refmap="" a9ae8fde2e t3404: directly test the behavior of interest 22a69fda19 git-rebase.txt: update description of --allow-empty-message f1928f04b2 grep: use no. of cores as the default no. of threads 70a9fef240 grep: move driver pre-load out of critical section 1184a95ea2 grep: re-enable threads in non-worktree case 6c307626f1 grep: protect packed_git [re-]initialization c441ea4edc grep: allow submodule functions to run in parallel d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules() 1d1729caeb grep: replace grep_read_mutex by internal obj read lock 31877c9aec object-store: allow threaded access to object reading b1fc9da1c8 replace-object: make replace operations thread-safe d5b0bac528 grep: fix racy calls in grep_objects() faf123c730 grep: fix race conditions at grep_submodule() c3a5bb31c1 grep: fix race conditions on userdiff calls 0222540827 fetch: emphasize failure during submodule fetch 232378479e Sync with maint e4837b4406 t7800: don't rely on reuse_worktree_file() fbce03d329 t4018: drop "debugging" cat from hunk-header tests f65d07fffa Makefile: use compat regex with SANITIZE=address 849e43cc18 built-in add -i: accept open-ended ranges again d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files a4ffbbbb99 submodule.c: mark more strings for translation 0cbb60574e dir: point treat_leading_path() warning to the right place ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent 22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2 f365bf40a0 clean: demonstrate a bug with pathspecs b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x 277eb5af7c t5604: make hash independent 44b6c05b43 t5601: switch into repository to hash object 7a868c51c2 t5562: use $ZERO_OID 1b8f39fb0d t5540: make hash size independent a8c17e3bd6 t5537: make hash size independent 832072219c t5530: compute results based on object length 74ad99b1d8 t5512: abstract away SHA-1-specific constants ba1be1ab45 t5510: make hash size independent cba472d3ad t5504: make hash algorithm independent 82d5aeb1e6 t5324: make hash size independent 3c5e65cac1 t5319: make test work with SHA-256 235d3cddb8 t5319: change invalid offset for SHA-256 compatibility 1d86c8f0ce t5318: update for SHA-256 525a7f1769 t4300: abstract away SHA-1-specific constants 7a1bcb251b t4204: make hash size independent cb78f4f0fe t4202: abstract away SHA-1-specific constants 717c939d8f t4200: make hash size independent 08a9dd891c t4134: compute appropriate length constant 215b60bf07 t4066: compute index line in diffs 194264c185 t4054: make hash-size independent 7d5ecd775d completion: list paths and refs for 'git worktree add' 3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands 3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options 367efd54b3 completion: return the index of found word from __git_find_on_cmdline() d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function 2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper 54887b4689 gpg-interface: add minTrustLevel as a configuration option 684ceae32d fetch: default to protocol version 2 33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION 8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate b9ab170752 config doc: protocol.version is not experimental 07ef3c6604 fetch test: use more robust test for filtered objects d6509da620 fetch test: mark test of "skipping" haves as v0-only a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function bf66db37f1 add: use advise function to display hints c958d3bd0a graph: fix collapse of multiple edges 8588932e20 graph: add test to demonstrate horizontal line bug d0d0a357a1 t: directly test parse_pathspec_file() 568cabb2fe t: fix quotes tests for --pathspec-from-file f94f7bd00d t: add tests for error conditions with --pathspec-from-file b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job 12acdf573a built-in add -p: handle Escape sequences more efficiently e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode 04f816b125 built-in add -p: respect the `interactive.singlekey` config setting a5e46e6b01 terminal: add a new function to read a single keystroke 9ea416cb51 terminal: accommodate Git for Windows' default terminal 94ac3c31f7 terminal: make the code of disable_echo() reusable 08b1ea4c39 built-in add -p: handle diff.algorithm 180f48df69 built-in add -p: support interactive.diffFilter 1e4ffc765d t3701: adjust difffilter test c81638541c submodule add: show 'add --dry-run' stderr when aborting 8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token 56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token d0654dc308 Git 2.25 b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po 4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'" ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1 e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master 1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' d78a1968c5 Merge branch 'ma/config-advice-markup-fix' a20ae3ee29 l10n: Update Catalan translation 49e268e23e mingw: safeguard better against backslashes in file names 4c6c7971e0 unpack-trees: correctly compute result count 63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1 75449c1b39 l10n: de.po: Reword generation numbers 6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t) 3901d2c6bd config/advice.txt: fix description list separator 7a6a90c6ec Git 2.25-rc2 1f5f3ffe5c Merge branch 'ds/graph-assert-fix' a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix' 202f68b252 Merge branch 'pm/am-in-body-header-doc-update' 7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix' c5dc20638b Merge branch 'do/gitweb-typofix-in-comments' fe47c9cb5f Merge https://github.com/prati0100/git-gui a1087c9367 graph: fix lack of color in horizontal lines 0d251c3291 graph: drop assert() for merge with two collapsing parents 4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper 573117dfa5 unpack-trees: watch for out-of-range index position e701bab3e9 restore: invalidate cache-tree when removing entries with --staged 1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command fa74180d08 checkout: don't revert file on ambiguous tracking branches 2957709bd4 parse_branchname_arg(): extract part as new function 5020f6806a t2018: improve style of if-statement 7ffb54618b t2018: add space between function name and () 63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH 065027ee1a string-list: note in docs that callers can specify sorting function 26f924d50e unpack-trees: exit check_updates() early if updates are not wanted 042ed3e048 The final batch before -rc2 0f1930cd1b Merge branch 'ds/sparse-cone' 037f067587 Merge branch 'ds/commit-graph-set-size-mult' f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify' c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode' a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' c4117fcb97 Merge branch 'pb/clarify-line-log-doc' 556f0258df Merge branch 'ew/packfile-syscall-optim' 5814d44d9b doc: submodule: fix typo for command absorbgitdirs 7047f75f22 editorconfig: indent text files with tabs 60440d72db sha1-file: document how to use pretend_object_file 7fdc5f296f l10n: es: 2.25.0 round #1 f8740c586b am: document that Date: can appear as an in-body header 4e2c4c0d4f gitweb: fix a couple spelling errors in comments 421c0ffb02 multi-pack-index: correct configuration in documentation 757ff352bd Documentation/git-sparse-checkout.txt: fix a typo 0d2116c644 Merge branch 'zs/open-current-file' 9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u) 3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master 4c5081614c l10n: fr.po v2.25.0 rnd 1 5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0 63020f175f commit-graph: prefer default size_mult when given zero 224c7d70fa mingw: only test index entries for backslashes, not tree entries 9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED 8679ef24ed Git 2.25-rc1 a82027e9e6 Merge branch 'js/use-test-tool-on-path' 13432fc6dd Merge branch 'js/mingw-reserved-filenames' e0e1ac5db0 Merge branch 'en/rebase-signoff-fix' b76a244c9d Merge branch 'em/freebsd-cirrus-ci' bc855232bc Merge branch 'bk/p4-misc-usability' 763a59e71c merge-recursive: remove unnecessary oid_eq function 44143583b7 sparse-checkout: use extern for global variables d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master 13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1 786f4d2405 git-gui: allow opening currently selected file in default app 4fd683b6a3 sparse-checkout: document interactions with submodules de11951b03 sparse-checkout: list directories in cone mode 0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0 578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed) 173fff68da Merge tag 'v2.25.0-rc0' into git-po-master f1842ff531 t2018: remove trailing space from test description 20a67e8ce9 t3008: find test-tool through path lookup 9e341f62ca l10n: Update Catalan translation 4e61b2214d packfile: replace lseek+read with pread ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision 2be45868a8 doc: log, gitk: document accepted line-log diff formats 280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD 0a76bd7381 mailmap: mask accentless variant for Công Danh 99c33bed56 Git 2.25-rc0 d2189a721c Merge branch 'en/fill-directory-fixes' 8be0a428d6 Merge branch 'rs/test-cleanup' 65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string' c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context' 45b96a6fa1 Merge branch 'js/add-p-in-c' ccc292e862 Merge branch 'jc/drop-gen-hdrs' dfee504bee Merge branch 'ja/doc-markup-cleanup' 87cbb1ca66 Merge branch 'rs/ref-read-cleanup' 20aa6d88b7 Merge branch 'rb/p4-lfs' fcd5b55f56 Merge branch 'pb/submodule-doc-xref' 4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free' ba6b66281e Merge branch 'ln/userdiff-elixir' bd72a08d6c Merge branch 'ds/sparse-cone' f3c520e17f Merge branch 'sg/name-rev-wo-recursion' 6514ad40a1 Merge branch 'ra/t5150-depends-on-perl' 17066bea38 Merge branch 'dl/format-patch-notes-config-fixup' 135365dd99 Merge branch 'am/pathspec-f-f-checkout' ff0cb70d45 Merge branch 'am/pathspec-from-file' 4dc42c6c18 mingw: refuse paths containing reserved names 98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16 c480eeb574 commit --interactive: make it work with the built-in `add -i` cee6cb7300 built-in add -p: implement the "worktree" patch modes 52628f94fc built-in add -p: implement the "checkout" patch modes 6610e4628a built-in stash: use the built-in `git add -p` if so configured 90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting 36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes d2a233cb8b built-in add -p: prepare for patch modes other than "stage" 761e3d26bb sparse-checkout: improve OS ls compatibility 6579d93a97 contrib/credential/netrc: work outside a repo 1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI b441717256 t1507: inline full_name() 9291e6329e t1507: run commands within test_expect_success 5236fce6b4 t1507: stop losing return codes of git commands 10812c2337 t1501: remove use of `test_might_fail cp` 62d58cda69 t1409: use test_path_is_missing() b87b02cfe6 t1409: let sed open its own input file 9b92070e52 t1307: reorder `nongit test_must_fail` 3595d10c26 t1306: convert `test_might_fail rm` to `rm -f` f511bc02ed t0020: use ! check_packed_refs_marked f6041abdcd t0020: don't use `test_must_fail has_cr` f46c243e66 t0003: don't use `test_must_fail attr_check` 99c049bc4c t0003: use test_must_be_empty() 3738439c77 t0003: use named parameters in attr_check() 7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err() b8afb908c2 t/lib-git-p4: use test_path_is_missing() 4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases 6836d2fe06 dir.c: use st_add3() for allocation size c847dfafee dir: consolidate similar code in treat_directory() 777b420347 dir: synchronize treat_leading_path() and read_directory_recursive() b9670c1f5e dir: fix checks on common prefix directory 5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit 23cbe427c4 Merge branch 'py/console-close-esc' 124a895811 t4015: improve coverage of function context test 509efef789 commit: forbid --pathspec-from-file --all 12029dc57d t3434: mark successful test as such e0f9095aaa notes.h: fix typos in comment 675ef6bab8 t6030: don't create unused file 01ed17dc8c t5580: don't create unused file f670adb49b t3501: don't create unused file 1e1ccbfdd3 git-gui: allow closing console window with Escape 7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays. b02fd2acca The sixth batch 59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex' e3b72391d1 Merge branch 'rs/commit-export-env-simplify' 43bf44e23a Merge branch 'rs/archive-zip-code-cleanup' 4438a1a59f Merge branch 'js/t3404-indent-fix' 3a44db2ed2 Merge branch 'dr/branch-usage-casefix' 8bc481f4f6 Merge branch 'sg/t9300-robustify' 011fc2e88e Merge branch 'js/add-i-a-bit-more-tests' d1c0fe8d9b Merge branch 'dl/range-diff-with-notes' 26c816a67d Merge branch 'hw/doc-in-header' f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context' 71a7de7a99 Merge branch 'dl/rebase-with-autobase' c9f5fc9114 Merge branch 'dl/test-cleanup' 6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap' 3beff388b2 Merge branch 'js/builtin-add-i-cmds' 4755a34c47 Merge branch 'dd/time-reentrancy' 37c2619d91 Merge branch 'ag/sequencer-todo-updates' 608e380502 git-p4: show detailed help when parsing options fail e2aed5fd5b git-p4: yes/no prompts should sanitize user text 571fb96573 fix-typo: consecutive-word duplications f371984613 Makefile: drop GEN_HDRS 2e4083198d built-in add -p: show helpful hint when nothing can be staged 54d9d9b2ee built-in add -p: only show the applicable parts of the help text ade246efed built-in add -p: implement the 'q' ("quit") command d6cf873340 built-in add -p: implement the '/' ("search regex") command 9254bdfb4f built-in add -p: implement the 'g' ("goto") command bcdd297b78 built-in add -p: implement hunk editing b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf" 11f2c0dae8 built-in add -p: coalesce hunks after splitting them 510aeca199 built-in add -p: implement the hunk splitting feature 0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions 5906d5de77 built-in app -p: allow selecting a mode change as a "hunk" 47dc4fd5eb built-in add -p: handle deleted empty files 80399aec5a built-in add -p: support multi-file diffs 7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed 12c24cf850 built-in add -p: color the prompt and the help text 25ea47af49 built-in add -p: adjust hunk headers as needed e3bd11b4eb built-in add -p: show colored hunks by default 1942ee44e8 built-in add -i: wire up the new C code for the `patch` command f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C d1b1384d61 userdiff: remove empty subexpression from elixir regex df5be01669 doc: indent multi-line items in list fd5041e127 doc: remove non pure ASCII characters 190a65f9db sparse-checkout: respect core.ignoreCase in cone mode 1d7297513d notes: break set_display_notes() into smaller functions 66f79ee23d config/format.txt: clarify behavior of multiple format.notes cc2bd5c45d gitmodules: link to gitsubmodules guide 99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed 8c02fe6060 t7004: don't create unused file cb05d6a5ed t4256: don't create unused file c5c4eddd56 dir: break part of read_directory_recursive() out for reuse 072a231016 dir: exit before wildcard fall-through if there is no wildcard 2f5d3847d4 dir: remove stray quote character in comment a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories" 452efd11fb t3011: demonstrate directory traversal failures ea94b16fb8 git-p4: honor lfs.storage configuration variable 51a0a4ed95 bisect--helper: avoid use-after-free d32e065a91 Merge branch 'kk/branch-name-encoding' ad05a3d8e5 The fifth batch 7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix' b089e5e6cb Merge branch 'em/test-skip-regex-illseq' 930078ba39 Merge branch 'hi/gpg-use-check-signature' 08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode' 7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk' 55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm' 41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress' 5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise' dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix' d37cfe3b5c Merge branch 'dl/pretty-reference' 99c4ff1bda Merge branch 'dl/submodule-set-url' 55d607d85b Merge branch 'js/mingw-inherit-only-std-handles' c58ae96fc4 Merge branch 'am/pathspec-from-file' 7c88714262 Merge branch 'po/bundle-doc-clonable' 5d9324e0f4 Merge branch 'ra/rebase-i-more-options' 7034cd094b Sync with Git 2.24.1 09ac67a183 format-patch: move git_config() before repo_init_revisions() 8164c961e1 format-patch: use --notes behavior for format.notes 452538c358 notes: extract logic into set_display_notes() e6e230eeae notes: create init_display_notes() helper 1e6ed5441a notes: rename to load_display_notes() 2866fd284c name-rev: cleanup name_ref() 49f7a2fde9 name-rev: eliminate recursion in name_rev() fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name' e05e8cf074 archive-zip: use enum for compression method 39acfa3d22 git gui: fix branch name encoding error 11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description 8cf8f9b4aa t3404: fix indentation 4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs 147ee35558 commit: use strbuf_add() to add a length-limited string 559c6fc317 The fourth batch 56e6c16394 Merge branch 'dl/lore-is-the-archive' 3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive' 7cb0d37f6d Merge branch 'tg/perf-remove-stale-result' 403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick' f0cf2fee5d Merge branch 'hi/grep-do-not-return-void' 391fb22ac7 Merge branch 'rs/use-skip-prefix-more' 92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd' 4ba74ca901 Merge branch 'rs/test-cleanup' f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick' ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9' 8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters 3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances dd432a6ecf name-rev: restructure parsing commits and applying date cutoff dd090a8a37 name-rev: pull out deref handling from the recursion 766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev() bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation e0c4da6f2a name-rev: avoid unnecessary cast in name_ref() c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name() c593a26348 t6120-describe: modernize the 'check_describe' helper abcf857300 range-diff: clear `other_arg` at end of function f8675343d7 range-diff: mark pointers as const 828765dfe0 t3206: fix incorrect test name 0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early 21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile b4bbbbd5a2 apply --allow-overlap: fix a corner case 89c8559367 git add -p: use non-zero exit code when the diff generation failed e91162be9c t3701: verify that the diff.algorithm config setting is handled 0c3222c4f3 t3701: verify the shown messages when nothing can be added 24be352d52 t3701: add a test for the different `add -p` prompts 8539b46534 t3701: avoid depending on the TTY prerequisite 0f0fba2cc8 t3701: add a test for advanced split-hunk editing 53a06cf39b Git 2.24.1 67af91c47a Sync with 2.23.1 a7312d1a28 Git 2.23.1 7fd9fd94fb Sync with 2.22.2 d9589d4051 Git 2.22.2 5421ddd8d0 Sync with 2.21.1 367f12b7e9 Git 2.21.1 20c71bcf67 Merge branch 'fix-msys2-quoting-bugs' 7d8b676992 mingw: sh arguments need quoting in more circumstances d9061ed9da t7415: drop v2.20.x-specific work-around 04522edbd4 mingw: fix quoting of empty arguments for `sh` 49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly fc346cb292 Sync with 2.20.2 4cd1cf31ef Git 2.20.2 c154745074 submodule: defend against submodule.update = !command in .gitmodules 4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x d851d94151 Sync with 2.19.3 caccc527ca Git 2.19.3 7c9fbda6e2 Sync with 2.18.2 9877106b01 Git 2.18.2 14af7ed5a9 Sync with 2.17.3 a5ab8d0317 Git 2.17.3 bb92255ebe fsck: reject submodule.update = !command in .gitmodules bdfef0492c Sync with 2.16.6 eb288bc455 Git 2.16.6 68440496c7 test-drop-caches: use `has_dos_drive_prefix()` 9ac92fed5b Sync with 2.15.4 7cdafcaacf Git 2.15.4 e904deb89d submodule: reject submodule.update = !command in .gitmodules d3ac8c3f27 Sync with 2.14.6 66d2a6159f Git 2.14.6 083378cc35 The third batch 88bd37a2d0 Merge branch 'js/pkt-line-h-typofix' 473b431410 Merge branch 'us/unpack-trees-fsmonitor' e0f9ec9027 Merge branch 'sg/test-bool-env' fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset' e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere' 88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory' 8feb47e882 Merge branch 'dl/t5520-cleanup' 6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree' 57d46bc602 Merge branch 'mg/doc-submodule-status-cached' 75bd003c7b Merge branch 'js/git-svn-use-rebase-merges' f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix' c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits' 36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree' cf91c31688 Merge branch 'sg/unpack-progress-throughput' ef6104581d Merge branch 'pb/submodule-update-fetches' 7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix' f3c7bfdde2 Merge branch 'dl/range-diff-with-notes' 9502b616f1 Merge branch 'jh/userdiff-python-async' 76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2' 995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label' f7998d9793 Merge branch 'js/builtin-add-i' 917d0d6234 Merge branch 'js/rebase-r-safer-label' 56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers' 2763530048 Merge branch 'jg/revert-untracked' fa38ab68b0 git-gui: revert untracked files by deleting them d9c6469f38 git-gui: update status bar to track operations 29a9366052 git-gui: consolidate naming conventions 0bb313a552 xdiff: unignore changes in function context 2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names' 65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods' 5532ebdeb7 Merge branch 'fix-mingw-quoting-bug' 76a681ce9c Merge branch 'dubiously-nested-submodules' dd53ea7220 Merge branch 'turn-on-protectntfs-by-default' f82a97eb91 mingw: handle `subst`-ed "DOS drives" 7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams' d2c84dad1c mingw: refuse to access paths with trailing spaces or periods 379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh 817ddd64c2 mingw: refuse to access paths with illegal characters cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors 7530a6287e quote-stress-test: allow skipping some trials 35edce2056 t6130/t9350: prepare for stringent Win32 path validation 55953c77c0 quote-stress-test: accept arguments to test via the command-line ad15592529 tests: add a helper to stress test argument quoting a8dee3ca61 Disallow dubiously-nested submodule git directories 9102f958ee protect_ntfs: turn on NTFS protection by default 91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams 6d8684161e mingw: fix quoting of arguments 3a85dc7d53 is_ntfs_dotgit(): speed it up 7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses 288a74bcd2 is_ntfs_dotgit(): only verify the leading segment a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark cae0bc09ab rebase: fix format.useAutoBase breakage 945dc55dda format-patch: teach --no-base 700e006c5d t4014: use test_config() a749d01e1d format-patch: fix indentation 0c47e06176 t3400: demonstrate failure with format.useAutoBase d9b31db2c4 t7700: stop losing return codes of git commands 3699d69df0 t7700: make references to SHA-1 generic dcf9a748ca t7700: replace egrep with grep cfe5eda02a t7700: consolidate code into test_has_duplicate_object() ae475afc0f t7700: consolidate code into test_no_missing_in_packs() 14b7664df8 doc: replace LKML link with lore.kernel.org d23f9c8e04 RelNotes: replace Gmane with real Message-IDs dcee037228 doc: replace MARC links with lore.kernel.org a9aecc7abb checkout, restore: support the --pathspec-from-file option cfd9376c1d doc: restore: synchronize <pathspec> description 8ea1189eac doc: checkout: synchronize <pathspec> description 6fdc9ad259 doc: checkout: fix broken text reference 1d022bb43f doc: checkout: remove duplicate synopsis bebb5d6d6b add: support the --pathspec-from-file option 21bb3083c3 cmd_add: prepare for next patch 4778452597 Merge branch 'prevent-name-squatting-on-windows' a7b1ad3b05 Merge branch 'jk/fast-import-unsafe' 525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()` e1d911dd4c mingw: disallow backslash characters in tree objects' file names 0060fd1511 clone --recurse-submodules: prevent name squatting on Windows a52ed76142 fast-import: disallow "feature import-marks" by default 68061e3470 fast-import: disallow "feature export-marks" by default 019683025f fast-import: delay creating leading directories for export-marks e075dba372 fast-import: stop creating leading directories for import-marks 11e934d56e fast-import: tighten parsing of boolean command line options 816f806786 t9300: create marks files for double-import-marks test f94804c1f2 t9300: drop some useless uses of cat 4f3e57ef13 submodule--helper: advise on fatal alternate error 10c64a0b3c Doc: explain submodule.alternateErrorStrategy ec48540fe8 packfile.c: speed up loading lots of packfiles 3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value a4fb016ba1 pkt-line: fix a typo 0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data 228f53135a The second batch 6c630f237e Merge branch 'jk/gitweb-anti-xss' 3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell' 4775e02a5c Merge branch 'ma/t7004' a6c6f8d02a Merge branch 'js/complete-svn-recursive' 3ae8defaf9 Merge branch 'jk/send-pack-remote-failure' aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix' 4ab9616c76 Merge branch 'sg/skip-skipped-prereq' 723a8adba5 Merge branch 'ds/test-read-graph' 9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation' 406ca29e0d Merge branch 'rs/parse-options-dup-null-fix' fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging' 8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion' ef8f621045 Merge branch 'dl/complete-rebase-onto' 3c3e5d0ea2 Merge branch 'tg/stash-refresh-index' 43c5fe1c1d Merge branch 'nn/doc-rebase-merges' 6511cb33c9 Merge branch 'dd/sequencer-utf8' f165457618 Merge branch 'jk/remove-sha1-to-hex' a774064fb0 Merge branch 'dj/typofix-merge-strat' ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates' d2489ce92c Merge branch 'rs/skip-iprefix' 376e7309e1 Merge branch 'ln/userdiff-elixir' 9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log' d3096d2ba6 Merge branch 'en/doc-typofix' 26f20fa3fc Merge branch 'ns/test-desc-typofix' ffd130a363 Merge branch 'en/t6024-style' 5149902ff9 Merge branch 'en/misc-doc-fixes' bcb06e204c Merge branch 'js/fetch-multi-lockfix' d08daec001 Merge branch 'rs/trace2-dots' fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix' bad5ed39cd Merge branch 'cb/curl-use-xmalloc' 7ab2088255 Merge branch 'rt/fetch-message-fix' f089ddd56a Merge branch 'es/myfirstcontrib-updates' 3c90710c0c Merge branch 'hw/config-doc-in-header' d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code' 5444d52866 Merge branch 'js/vreportf-wo-buffering' 05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add' ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides' 532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default' dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists' fac9ab1419 Merge branch 'ma/bisect-doc-sample-update' a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix' 0be5caf97c Merge branch 'jc/log-graph-simplify' 0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck' 2e697ced9d built-in add -i: offer the `quit` command d7633578b5 built-in add -i: re-implement the `diff` command 8746e07277 built-in add -i: implement the `patch` command ab1e1cccaf built-in add -i: re-implement `add-untracked` in C c54ef5e424 built-in add -i: re-implement `revert` in C a8c45be939 built-in add -i: implement the `update` command f37c226454 built-in add -i: prepare for multi-selection commands c08171d156 built-in add -i: allow filtering the modified files list 0c3944a628 add-interactive: make sure to release `rev.prune_data` 4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance 867fc7f310 grep: don't return an expression from pcre2_free() c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables 72b006f4bf gpg-interface: prefer check_signature() for GPG verification 7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r ccd469450a date.c: switch to reentrant {gm,local}time_r 271c351b2f t7811: don't create unused file 65efb42862 t9300: don't create unused file f6b9413baf sequencer: fix a memory leak in sequencer_continue() 3eae30e464 doc: replace public-inbox links with lore.kernel.org 46c67492aa doc: recommend lore.kernel.org over public-inbox.org 5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects 17a4ae92ea t7700: s/test -f/test_path_is_file/ d2eee32a89 t7700: move keywords onto their own line 7a1c8c2346 t7700: remove spaces after redirect operators 09279086e8 t7700: drop redirections to /dev/null 756ee7fc9f t7501: stop losing return codes of git commands 38c1aa01de t7501: remove spaces after redirect operators 763b47bafa t5703: stop losing return codes of git commands eacaa1c180 t5703: simplify one-time-sed generation logic a29b2429e5 t5317: use ! grep to check for no matching lines 6c37f3ec1b t5317: stop losing return codes of git commands b66e0a1773 t4138: stop losing return codes of git commands afd43c9905 t4015: use test_write_lines() 946d2353a3 t4015: stop losing return codes of git commands 50cd31c652 t3600: comment on inducing SIGPIPE in `git rm` 3b737381d8 t3600: stop losing return codes of git commands 0d913dfa7e t3600: use test_line_count() where possible 29a40b5a67 t3301: stop losing return codes of git commands 9b5a9fa60a t0090: stop losing return codes of git commands 17aa9d9c1a t0014: remove git command upstream of pipe 77a946be98 apply-one-time-sed.sh: modernize style 176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job ed254710ee test: use test_must_be_empty F instead of test_cmp empty F c74b3cbb83 t7812: add missing redirects 213dabf49d test: use test_must_be_empty F instead of test -z $(cat F) c93a5aaec8 t1400: use test_must_be_empty 6e4826ea75 t1410: use test_line_count a5d04a3ef9 t1512: use test_line_count 54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd() 2059e79c0d name-rev: use skip_prefix() instead of starts_with() 1768aaf01d push: use skip_prefix() instead of starts_with() ec6ee0c07a shell: use skip_prefix() instead of starts_with() 7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with() a6293f5d28 fetch: use skip_prefix() instead of starts_with() 13ca8fb79e t5150: skip request-pull test if Perl is disabled ecc0869080 commit-graph: use start_delayed_progress() 44a4693bfc progress: create GIT_PROGRESS_DELAY 528d9e6d01 t/perf: don't depend on Git.pm b8dcc45387 perf-lib: use a single filename for all measurement types fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk' d82dfa7f5b rebase -i: finishing touches to --reset-author-date 1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory 393adf7a6f sequencer: directly call pick_commits() from complete_action() a2dd67f105 rebase: fill `squash_onto' in get_replay_opts() 3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function 34065541e3 sequencer: update `done_nr' when skipping commands in a todo list 8638114e06 sequencer: update `total_nr' when adding an item to a todo list 0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions 9917eca794 l10n: zh_TW: add translation for v2.24.0 0a8e3036a3 reset: parse rev as tree-ish in patch mode f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits 8d483c8408 doc: document 'git submodule status --cached' befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later 9a780a384d mingw: spawned processes need to inherit only standard handles c5a03b1e29 mingw: work around incorrect standard handles eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool 43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values 2d05ef2778 sequencer: fix empty commit check when amending ea8b7be147 git svn: stop using `rebase --preserve-merges` 67a6ea6300 gpg-interface: limit search for primary key fingerprint 392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern cff4e9138d sparse-checkout: check for dirty status 416adc8711 sparse-checkout: update working directory in-process for 'init' f75a69f880 sparse-checkout: cone mode should not interact with .gitignore fb10ca5b54 sparse-checkout: write using lockfile 99dfa6f970 sparse-checkout: use in-process update for disable subcommand e091228e17 sparse-checkout: update working directory in-process e9de487aa3 sparse-checkout: sanitize for nested folders 4dcd4def3c unpack-trees: add progress to clear_ce_flags() eb42feca97 unpack-trees: hash less in cone mode af09ce24a9 sparse-checkout: init and set in cone mode 96cc8ab531 sparse-checkout: use hashmaps for cone patterns 879321eb0b sparse-checkout: add 'cone' mode e6152e35ff trace2: add region in clear_ce_flags 72918c1ad9 sparse-checkout: create 'disable' subcommand 7bffca95ea sparse-checkout: add '--stdin' option to set subcommand f6039a9423 sparse-checkout: 'set' subcommand d89f09c828 clone: add --sparse mode bab3c35908 sparse-checkout: create 'init' subcommand 94c0956b60 sparse-checkout: create builtin with 'list' subcommand 679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files df6d3d6802 lib-bash.sh: move `then` onto its own line 2a02262078 t5520: replace `! git` with `test_must_fail git` c245e58bb6 t5520: remove redundant lines in test cases a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp e959a18ee7 t5520: don't put git in upstream of pipe 5540ed27bc t5520: test single-line files by git with test_cmp dd0f1e767b t5520: use test_cmp_rev where possible 979f8891cc t5520: replace test -{n,z} with test-lib functions 3037d3db90 t5520: use test_line_count where possible 93a9bf876b t5520: remove spaces after redirect operator ceeef863de t5520: replace test -f with test-lib functions 4c8b046f82 t5520: let sed open its own input 53c62b9810 t5520: use sq for test case names e8d1eaf9b4 t5520: improve test style 2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals 8cb7980382 t0000: test multiple local assignment 5b583e6a09 format-patch: pass notes configuration to range-diff bd36191886 range-diff: pass through --notes to `git log` 9f726e1b87 range-diff: output `## Notes ##` header 3bdbdfb7a5 t3206: range-diff compares logs with commit notes 75c5aa0701 t3206: s/expected/expect/ 79f3950d02 t3206: disable parameter substitution in heredoc 3a6e48e9f7 t3206: remove spaces after redirect operators 26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish 077a1fda82 userdiff: support Python async functions 3798149a74 SubmittingPatches: use `--pretty=reference` 1f0fc1db85 pretty: implement 'reference' format 618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type 0df621172d pretty: provide short date format ac52d9410e t4205: cover `git log --reflog -z` blindspot 3e8ed3b93e pretty.c: inline initalize format_context 4982516451 revision: make get_revision_mark() return const pointer f0f9de2bd7 completion: complete `tformat:` pretty format fb2ffa77a6 SubmittingPatches: remove dq from commit reference bae74c9dfb pretty-formats.txt: use generic terms for hash bd00717eab SubmittingPatches: use generic terms for hash 9d45ac4cbf rev-list-options.txt: remove reference to --show-notes 828e829b9e argv-array: add space after `while` e440fc5888 commit: support the --pathspec-from-file option 66a25a7242 doc: commit: synchronize <pathspec> description 64bac8df97 reset: support the `--pathspec-from-file` option d137b50756 doc: reset: synchronize <pathspec> description 24e4750c96 pathspec: add new function to parse file 0dbc4a0edf ci(osx): update homebrew-cask repository with less noise e02058a729 sequencer: handle rebase-merges for "onto" message bae60ba7e9 builtin/unpack-objects.c: show throughput progress 2d92ab32fd rev-parse: make --show-toplevel without a worktree an error 9e5afdf997 fetch: add trace2 instrumentation 4c4066d95d run-command: move doc to run-command.h 6c51cb525d trace2: move doc to trace2.h 7db0305438 parse-options: add link to doc file in parse-options.h d95a77d059 submodule-config: move doc to submodule-config.h f3b9055624 credential: move doc to credential.h bbcfa3002a tree-walk: move doc to tree-walk.h 971b1f24a2 argv-array: move doc to argv-array.h f1ecbe0f53 trace: move doc to trace.h 13aa9c8b70 cache: move doc to cache.h c0be43f898 sigchain: move doc to sigchain.h 19ef3ddd36 pathspec: move doc to pathspec.h 301d595e72 revision: move doc to revision.h 3a1b3415d9 attr: move doc to attr.h 126c1ccefb refs: move doc to refs.h d27eb356bf remote: move doc to remote.h and refspec.h 405c6b1fbc sha1-array: move doc to sha1-array.h d3d7172e40 merge: move doc to ll-merge.h 3f1480b745 graph: move doc to graph.h and graph.c 266f03eccd dir: move doc to dir.h 13c4d7eb22 diff: move doc to diff.h and diffcore.h cd5522271f rebase -r: let `label` generate safer labels 867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()` 8c15904462 built-in add -i: implement the `help` command 3d965c7674 built-in add -i: use color in the main loop 68db1cbf8e built-in add -i: support `?` (prompt help) 76b743234c built-in add -i: show unique prefixes of the commands 6348bfba58 built-in add -i: implement the main loop a376e37b2c gitweb: escape URLs generated by href() b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI f28bceca75 t/gitweb-lib.sh: drop confusing quotes 0eba60c9b7 t9502: pass along all arguments in xss helper 932757b0cc INSTALL: use existing shell scripts as example b018719927 t7004: check existence of correct tag 1daaebcaa5 built-in add -i: color the header in the `status` command 5e82b9e4d2 built-in add -i: implement the `status` command e4cb659ebd diff: export diffstat interface f83dff60a7 Start to implement a built-in version of `git add --interactive` df53c80822 stash: make sure we have a valid index before writing it ad7a403268 send-pack: check remote ref status on pack-objects failure d91ce887c9 t6120-describe: correct test repo history graph in comment 1f9247a3bd completion: tab-complete "git svn --recursive" 603960b50e promisor-remote: remove fetch_if_missing=0 e362fadcd0 clone: remove fetch_if_missing=0 169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL 51bd6be32d mingw: use COPY_ARRAY for copying array 4bd0593e0f test-tool: use 'read-graph' helper e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway d784d978f6 t4215: use helper function to check output 61eea521fe fsmonitor: do not compare bitmap size with size of split index b19f3fe9dd hex: drop sha1_to_hex() c1ce9c06d0 completion: learn to complete `git rebase --onto=` f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase aa6d7f93ed hex: drop sha1_to_hex_r() 52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch 5772b0c745 sequencer: reencode old merge-commit message e0eba649e8 bundle-verify: add --quiet 79862b6b77 bundle-create: progress output control 73c3253d75 bundle: framework for options before bundle file 68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in" b375744274 sequencer: reencode squashing commit's message 019a9d8362 sequencer: reencode revert/cherry-pick's todo list 0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding 1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary d9f6f3b619 The first batch post 2.24 cycle 28014c1084 Merge branch 'bc/hash-independent-tests-part-6' 57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree' c22f63c40f Merge branch 'pb/pretty-email-without-domain-part' 5731ca3657 Merge branch 'hw/remove-api-docs-placeholder' 14b58c62bc Merge branch 'sg/commit-graph-usage-fix' eff313f8a7 Merge branch 'dl/apply-3way-diff3' db806d7064 Merge branch 'sg/dir-trie-fixes' f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix' 8f1119b988 Merge branch 'wb/midx-progress' d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes' 0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges' 8f40d89783 Merge branch 'hv/bitshift-constants-in-blame' d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head' 5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer' b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc' 15d9f3dc66 Merge branch 'es/walken-tutorial' 026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor' ed28358833 convert: use skip_iprefix() in validate_encoding() 89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding() 03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules ae821ffe83 multimail: fix a few simple spelling errors 557c5895c2 sha1dc: fix trivial comment spelling error aa74be316a Fix spelling errors in test commands 96c0caf5e3 Fix spelling errors in messages shown to users 4dc8b1c114 Fix spelling errors in names of tests 7a40cf1553 Fix spelling errors in comments of testcases 15beaaa3d1 Fix spelling errors in code comments a807200f67 userdiff: add Elixir to supported userdiff languages 461caf3e8a git-shortlog.txt: include commit limiting options 6462d5eb9a fetch: remove fetch_if_missing=0 46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion 99b2ba35f5 t0028: eliminate non-standard usage of printf add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul` 14c4776d75 t: fix typo in test descriptions 270de6acbe t6024: modernize style 77363a51fb name-hash.c: remove duplicate word in comment c92faa4d22 hashmap: fix documentation misuses of -> versus . a6d39f2efb git-filter-branch.txt: correct argument name typo 4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators 8915297925 Fix spelling errors in documentation outside of Documentation/ 031fd4b93b Documentation: fix a bunch of typos, both old and new dd0b61f577 fsmonitor: fix watchman integration 5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare() 7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph c14e6e7903 fetch: add the command-line option `--write-commit-graph` da72936f54 Git 2.24 1d34d425d4 Merge branch 'bc/doc-use-docbook-5' dac1d83c91 Merge branch 'ds/commit-graph-on-fetch' c32ca691c2 Merge branch 'jt/delay-fetch-if-missing' ab6b50e4c8 Merge https://github.com/prati0100/git-gui 93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2 fe28ad8520 rebase: add --reset-author-date 08187b4cba rebase -i: support --ignore-date 0185c683c9 sequencer: rename amend_author to author_to_rename cbd8db17ac rebase -i: support --committer-date-is-author-date c068bcc59b sequencer: allow callers of read_author_script() to ignore fields ba51d2fb24 rebase -i: add --ignore-whitespace flag 3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower 3ada78de3f myfirstcontrib: add dependency installation step 4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt 4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly 8dfb04ae96 update-index: optionally leave skip-worktree entries alone 116d1fa6c6 vreportf(): avoid relying on stdio buffering efd5444238 RelNotes/2.24.0: fix self-contradictory note 391c7e40b5 fetch.c: fix typo in a warning message 55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template 849e43680d RelNotes/2.24.0: typofix 0115e5d929 git-diff.txt: document return code of `--no-index` 798d66e35d l10n: de.po: Update German translation c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u) f21f8f5d35 Git 2.24-rc2 8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix' 0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix' f2db52c46b Merge branch 'js/mingw-needs-hiding-fix' 5b7594abdc Merge branch 'master' of github.com:vnwildman/git 034d33653a Merge branch 'next' of github.com:ChrisADR/git-po 26b061007c submodule: teach set-url subcommand 460782b7be t7519-status-fsmonitor: improve comments d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses 4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config 1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694) f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0 762d5b4f46 help: add gitsubmodules to the list of guides 76a53d640f git_path(): handle `.lock` files correctly 3ce47211a6 t1400: wrap setup code in test case 44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string 6c02042139 clone: rename static function `dir_exists()`. 8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command 77200e9332 l10n: es: 2.24.0 round 2 e42df36b42 Merge branch 'l10n/it/update-italian-translation' 5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2 51728480fe l10n: fr v2.24.0 rnd2 045a548698 l10n: git.pot: v2.24.0 round 2 (1 new) 468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree() c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit() 103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag() f648ee7088 fsck: rename vague "oid" local variables cc579000bf fsck: don't require an object struct in verify_headers() 7854399366 fsck: don't require an object struct for fsck_ident() b8b00f1693 fsck: drop blob struct from fsck_finish() 6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob() 38370253fd fsck: don't require an object struct for report() f59793763d fsck: only require an oid for skiplist functions 5afc4b1dc6 fsck: only provide oid/type in fsck_error callback 82ef89b318 fsck: don't require object structs for display functions 733902905d fsck: use oids rather than objects for object_name API d40bbc109b fsck_describe_object(): build on our get_object_name() primitive a59cfb3230 fsck: unify object-name code 23a173a761 fsck: require an actual buffer for non-blobs 2175a0c601 fsck: stop checking tag->tagged ec65231571 fsck: stop checking commit->parent counts 1de6007d85 fsck: stop checking commit->tree value 228c78fbd4 commit, tag: don't set parsed bit for parse failures 60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()` 8b656572ca builtin/commit-graph.c: remove subcommand-less usage string fa26d5ede6 t4048: abstract away SHA-1-specific constants cf02be8486 t4045: make hash-size independent 38ee26b2a3 t4044: update test to work with SHA-256 37ab8ebef1 t4039: abstract away SHA-1-specific constants 0370b35414 t4038: abstract away SHA-1 specific constants 0253e126a2 t4034: abstract away SHA-1-specific constants 45e2ef2b1d t4027: make hash-size independent 79b0edc1a0 t4015: abstract away SHA-1-specific constants 840624ff55 t4011: abstract away SHA-1-specific constants 32a6707267 t4010: abstract away SHA-1-specific constants 440bf91dfa t3429: remove SHA1 annotation 0b408ca2bd t1305: avoid comparing extensions 2eabd38313 rev-parse: add a --show-object-format option 52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode 45e206f0d8 t4203: use test-lib.sh definitions 2ae4944aac t6006: use test-lib.sh definitions cb99a34e23 commit-graph: fix writing first commit-graph during fetch e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug 7b4fb434b4 documentation: remove empty doc files 566a1439f6 Git 2.24-rc1 04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix' 4d6fb2beeb Merge branch 'ds/feature-macros' 5f0b6ed907 Merge branch 'js/azure-ci-osx-fix' c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs' 1b4f85285f Merge branch 'dl/submodule-set-branch' c7aadccba0 fetch: delay fetch_if_missing=0 until after config c11e9966cb repo-settings: read an int for index.version 091489d068 apply: respect merge.conflictStyle in --3way aa76ae4905 t4108: demonstrate bug in apply 95806205cd t4108: use `test_config` instead of `git config` b0069684d4 t4108: remove git command upstream of pipe fa87b81385 t4108: replace create_file with test_write_lines 7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job 6c96630cb0 config: move documentation to config.h d81542e6f3 Eleventh batch e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix' d45d771978 Merge branch 'bc/smart-http-atomic-push' 22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix' 2e215b7959 Merge branch 'sb/userdiff-dts' e3cf08361a Merge branch 'sg/progress-fix' b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix' c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc' f45f88b2e4 path.c: don't call the match function without value in trie_find() c72fc40d09 path.c: clarify two field names in 'struct common_dir' 8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file 7cb8c929d7 path.c: clarify trie_find()'s in-code comment e536b1fedf Documentation: mention more worktree-specific exceptions 680cba2c2b multi-pack-index: add [--[no-]progress] option. 64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file 8dc18f8937 midx: add progress to expire_midx_packs 840cef0c70 midx: add progress to write_midx_file efbc3aee08 midx: add MIDX_PROGRESS flag 0eb3671ed9 ci(osx): use new location of the `perforce` cask da1e295e00 t604[236]: do not run setup in separate tests 49b8133a9e merge-recursive: fix merging a subdirectory into the root directory d3eebaad5e merge-recursive: clean up get_renamed_dir_portion() 80736d7c5e doc: am --show-current-patch gives an entire e-mail message a8e2c0eadc t7419: change test_must_fail to ! for grep 19c29e538e t4014: make output-directory tests self-contained 12a4aeaad8 Merge branch 'js/azure-pipelines-msvc' 399c23c046 ci(visual-studio): actually run the tests in parallel 711cd6d15c ci(visual-studio): use strict compile flags, and optimization 370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0 cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master 907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master 13bcea8c7f l10n: fr 2.24.0 rnd 1 135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master 3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed) 8da56a4848 userdiff: fix some corner cases in dts regex 86795774bb builtin/blame.c: constants into bit shift format feebd2d256 rebase: hide --preserve-merges option 0e40a73a4c Doc: Bundle file usage 78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error 12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error 2b6f6ea1bd test-progress: fix test failures on big-endian systems f757409e36 l10n: bg.po: Updated Bulgarian translation (4693) 176f5adfdb completion: clarify installation instruction for zsh d966095db0 Git 2.24-rc0 90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array' 3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth' d0258d0944 Merge branch 'rs/http-push-simplify' bb52def6da Merge branch 'jj/stash-reset-only-toplevel' f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs' e5fca6b573 Merge branch 'bb/compat-util-comment-fix' 43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup' 07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely' 2d74d28ee0 Merge branch 'dl/compat-cleanup' 9b83a94829 Merge branch 'ta/t1308-typofix' 376012c919 Merge branch 'js/doc-stash-save' 10da030ab7 grep: avoid leak of chartables in PCRE2 513f2b0bbd grep: make PCRE2 aware of custom allocator 57d4660468 grep: make PCRE1 aware of custom allocator d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand 8af69cf3e2 t3301: test diagnose messages for too few/many paramters 6f1194246a remote-curl: pass on atomic capability to remote side bbb13e8188 graph: fix coloring of octopus dashes 92beecc136 graph: flatten edges that fuse with their right neighbor 479db18bc0 graph: smooth appearance of collapsing edges on commit lines 0195285b95 graph: rename `new_mapping` to `old_mapping` d62893ecc1 graph: commit and post-merge lines for left-skewed merges 0f0f389f12 graph: tidy up display of left-skewed merges 458152cce1 graph: example of graph output that can be simplified ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state 46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()` a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()` 9157a2a032 graph: reuse `find_new_column_by_commit()` 210179a20d graph: handle line padding in `graph_next_line()` fbccf255f9 graph: automatically track display width of graph lines 5374a290aa fetch-pack: write fetched refs to .promisor 4627bc777e sequencer: run post-commit hook 49697cb721 move run_commit_hook() to libgit and use it there 12bb7a540a sequencer.h fix placement of #endif 6a619ca03c t3404: remove uneeded calls to set_fake_editor b2dbacbddf t3404: set $EDITOR in subshell 88a92b6c73 t3404: remove unnecessary subshell bf8e65b30b format-patch: teach --cover-from-description option a92331df18 format-patch: use enum variables 46273df7bf format-patch: replace erroneous and condition 3b3c79f6c9 diff-highlight: fix a whitespace nit 108b97dc37 Ninth batch cbe8cdd3a0 Merge branch 'jk/coc' 3b9ec27919 Merge branch 'js/trace2-fetch-push' c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch' 1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup' eb3de5b823 Merge branch 'js/xdiffi-comment-updates' 4e8371ec26 Merge branch 'dl/t0000-skip-test-test' b6d712fa4e Merge branch 'tg/range-diff-output-update' 77458870a5 Merge branch 'gs/sq-quote-buf-pretty' 5efabc7ed9 Merge branch 'ew/hashmap' d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files' 6ed610b968 Merge branch 'am/t0028-utf16-tests' 5b900fb812 Merge branch 'dl/octopus-graph-bug' 16d9d7184b Merge branch 'en/fast-imexport-nested-tags' 6d5291be45 Merge branch 'js/azure-pipelines-msvc' ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd' d96e31e390 Merge branch 'js/fetch-jobs' 280bd44551 Merge branch 'en/merge-recursive-cleanup' 062a309d36 remote-curl: use argv_array in parse_push() a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes 5cc6a4be11 http-push: simplify deleting a list item 556895d0c8 stash: avoid recursive hard reset on submodules b524f6b399 Merge branch 'ka/japanese-translation' f6f3824b4e git-gui: improve Japanese translation 61f4b407d3 Merge branch 'py/readme' 1e6880fd06 git-gui: add a readme edefc31873 format-patch: create leading components of output directory 68b69211b2 git-compat-util: fix documentation syntax fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth() e0479fa073 documentation: add tutorial for object walking 3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed 4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target 9cad1c4488 pthread.h: manually align parameter lists 8c1cfd58e3 t1308-config-set: fix a test that has a typo 57d8f4b4c7 doc(stash): clarify the description of `save` 08da6496b6 Eighth batch 07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup' f0d407e6ae Merge branch 'kt/add-i-progress' 66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree' a4c5d9f66e Merge branch 'rs/dedup-includes' 159cdabd87 Merge branch 'js/range-diff-noprefix' 93424f1f7d Merge branch 'cb/pcre1-cleanup' a73f91774c Merge branch 'ab/pcre-jit-fixes' 4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword' 020011f2cb Merge branch 'tk/git-svn-trim-author-name' 676278f8ea Merge branch 'bc/object-id-part17' aafb75452b Merge branch 'en/clean-nested-with-ignored' 3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails 5cdf2301d4 add a Code of Conduct document 70bf0b755a Seventh batch 9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat' 2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary' d17f54947d Merge branch 'rs/convert-fix-utf-without-dash' 82c80f98e6 Merge branch 'py/git-gui-has-maintainer' 6e12570822 Merge branch 'ah/cleanups' 772cad0afb Merge branch 'js/diff-rename-force-stable-sort' 424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path' 678a9ca629 Merge branch 'as/shallow-slab-use-fix' 0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix' 042a54d251 Merge branch 'am/visual-studio-config-fix' 03d3b1297c xdiffi: fix typos and touch up comments b05b40930e t0000: cover GIT_SKIP_TESTS blindspots d8bc1a518a send-pack: never fetch when checking exclusions 756fb0dedb t4014: treat rev-list output as the expected value 2b6a9b13ca range-diff: don't segfault with mode-only changes 360c7ba330 transport: push codepath can take arbitrary repository ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments b657047719 merge-recursive: fix the fix to the diff3 common ancestor label b744c3af07 Sixth batch 417056578a Merge branch 'bw/submodule-helper-usage-fix' 9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check' 1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a' 59b19bcd9f Merge branch 'cc/multi-promisor' 1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way' 5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort' eb35c18e42 Merge branch 'sg/travis-help-debug' cabb145fe3 Merge branch 'rs/alias-use-copy-array' 56c7ab0f4e Merge branch 'sg/t-helper-gitignore' e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang' 583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules' 337e3f2b49 Merge branch 'rs/nth-switch-code-simplification' 8f53fe1733 Merge branch 'hb/hg-to-git-py3' ef93bfbd45 Merge branch 'sg/progress-fix' 980351d1ac Merge branch 'js/doc-patch-text' 80693e3f09 Merge branch 'tb/commit-graph-harden' ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge' 3f84633563 Merge branch 'dl/cocci-everywhere' caf150ce7d Merge branch 'gs/commit-graph-progress' 1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim' 1398171378 Merge branch 'rs/commit-graph-use-list-count' 773521df26 Merge branch 'rs/nth-parent-parse' 7f17913161 Merge branch 'dl/submodule-set-branch' cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix' bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees' 098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack' 37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc' e392382f95 Merge branch 'dl/complete-rebase-and-archive' cda8faa37e Merge branch 'jk/commit-graph-cleanup' 36d2fca82b Merge branch 'ss/get-time-cleanup' ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude' ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob' ba2d451122 Merge branch 'tg/stash-refresh-index' e2b5038d87 hashmap_entry: remove first member requirement from docs 404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry 23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators c8e424c9c9 hashmap: introduce hashmap_free_entries 8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry * 87571c3f71 hashmap: use *_entry APIs for iteration 939af16eac hashmap_cmp_fn takes hashmap_entry params f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *" f0e63c4113 hashmap: use *_entry APIs to wrap container_of 6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *" 973d5eea74 introduce container_of macro 26b455f21e hashmap_put takes "struct hashmap_entry *" 28ee794128 hashmap_remove takes "const struct hashmap_entry *" b6c5241606 hashmap_get takes "const struct hashmap_entry *" b94e5c1df6 hashmap_add takes "struct hashmap_entry *" f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *" d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *" d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry 12878c8351 coccicheck: detect hashmap_entry.hash assignment e010a41216 diff: use hashmap_entry_init on moved_entry.ent f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo" de5abb5f7a git-p4: auto-delete named temporary file c90b652afd Fifth batch f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1' b0f8aed48f Merge branch 'ma/user-manual-markup-update' faf5576a8d Merge branch 'bc/doc-use-docbook-5' 314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes' 70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo' 847650798b Merge branch 'am/mailmap-andrey-mazo' 1a155f2e66 Merge branch 'jc/git-gui-has-maintainer' 1bcef51204 t/oid-info: add empty tree and empty blob values ecde49bb8a t/oid-info: allow looking up hash algorithm name 11a3d3aadd git-rev-list.txt: prune options in synopsis 7d2f003ee4 Documentation: update the location of the git-gui repo b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding() 46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines b35304bf95 ci: really use shallow clones on Azure Pipelines ab7d854aba tests: let --immediate and --write-junit-xml play well together be5d88e112 test-tool run-command: learn to run (parts of) the testsuite 5d65ad17a9 vcxproj: include more generated files 030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built 61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable() e4347c9434 msvc: handle DEVELOPER=1 ed712ef8d5 msvc: ignore some libraries when linking 5b8f9e2417 compat/win32/path-utils.h: add #include guards 41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning c097b95a26 msvc: avoid using minus operator on unsigned types dfd557c978 stash apply: report status correctly even in a worktree's subdirectory d54dea77db fetch: let --jobs=<n> parallelize --multiple, too 87db61a436 trace2: write discard message to sentinel files 83e57b04e6 trace2: discard new traces if target directory has too many files 11c21f22de t4214: demonstrate octopus graph coloring failure 25eb905e14 t4214: explicitly list tags in log 63be8c8dd7 t4214: generate expect in their own test cases a7a5590c6e t4214: use test_merge 94ba151300 test-lib: let test_merge() perform octopus merges 22541013d0 docs: clarify trace2 version invariants 3d4548e7e2 docs: mention trace2 target-dir mode in git-config 2fe44394c8 treewide: remove duplicate #include directives dbcd970c27 push: do not pretend to return `int` from `die_push_simple()` 941790d7de fast-export: handle nested tags 8d7d33c1ce t9350: add tests for tags of things other than a commit a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags 208d69246e fast-export: add support for --import-marks-if-exists b8f50e5b60 fast-import: add support for new 'alias' command f73b2aba05 fast-import: allow tags to be identified by mark labels 3164e6bd24 fast-import: fix handling of deleted tags 8085050ab4 add -i: show progress counter in the prompt 69fdb922ad Merge branch 'bw/diff3-conflict-style' b436825b9b git-gui: support for diff3 conflict style 937b76ed49 range-diff: internally force `diff.noprefix=true` 411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job 25e4b8099c push: add trace2 instrumentation 5fc31180d8 fetch: add trace2 instrumentation 53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value c3b57dc2a0 git-gui: use existing interface to query a path's attribute 45ab460d4a Merge branch 'js/git-bash-if-available' 0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command 71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only) 54a80a9ad8 wrapper: use a loop instead of repetitive statements baed6bbb5b diffcore-break: use a goto instead of a redundant if statement 8da02ce62a commit-graph: remove a duplicate assignment ddb3c856f3 shallow.c: don't free unallocated slabs 8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits 65904b8b2b promisor-remote: skip move_to_tail when no-op 2049b8dc65 diffcore_rename(): use a stable sort 97fff61012 Move git_sort(), a stable sort, into into libgit.a 69f272b922 dir: special case check for the possibility that pathspec is NULL 6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available bc12974a89 Fourth batch 5a5350940b Merge branch 'ds/commit-graph-on-fetch' 974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch' 9755f70fe6 Merge branch 'ds/include-exclude' 93fc8760e7 Merge branch 'jh/trace2-pretty-output' 640f9cd599 Merge branch 'dl/rebase-i-keep-base' 026428c35e Merge branch 'sg/clean-nested-repo-with-ignored' 21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip' d693345518 Merge branch 'dl/use-sq-from-test-lib' d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes' 2be6ccc01a Merge branch 'sg/git-test-boolean' cf861cd7a0 Merge branch 'rs/get-tagged-oid' 91243b019d Merge branch 'en/filter-branch-deprecation' 9bc67b6658 Merge branch 'en/merge-options-ff-and-friends' fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden' cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option' 8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return' 3ff6af7753 Merge branch 'nd/switch-and-restore' aadac067aa Merge branch 'tb/file-url-to-unc-path' b57a88a5f1 Merge branch 'js/gitdir-at-unc-root' 6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path' 430439536b Merge branch 'rs/parse-tree-indirect' 991fd97b9a Merge branch 'jk/fast-import-history-bugfix' 74a39b9bcc Merge branch 'mh/notes-duplicate-entries' 37801f0665 Merge branch 'tb/banned-vsprintf-namefix' 21ce0b48f3 Merge branch 'mh/release-commit-memory-fix' f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup' bf6136cab8 Merge branch 'rs/strbuf-detach' a2e22bb3ad Merge branch 'rs/trace2-dst-warning' 1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup' 0281733483 Merge branch 'bc/hash-independent-tests-part-5' f06fb376ed Merge branch 'jc/test-cleanup' 00bb74453d Merge branch 'dl/compat-cleanup' 59438be06c Merge branch 'js/visual-studio' cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone' af2abd870b fast-export: fix exporting a tag and nothing else c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit fd5b820d9c user-manual.txt: change header notation e79b34533a user-manual.txt: add missing section label b503a2d515 Makefile: emulate compile in $(HCO) target better af26e2a9d2 pack-bitmap.h: remove magic number b06fdead04 promisor-remote.h: include missing header 97b989ee3a apply.h: include missing header 4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name d928a8388a t0028: add more tests 0b63fd6965 t0028: fix test for UTF-16-LE-BOM fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration 2e09c01232 name-rev: avoid cutoff timestamp underflow 8464f94aeb promisor-remote.h: drop extern from function declaration 75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp 24c681794f doc: MyFirstContribution: fix cmd placement instructions c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode 60c60b627e Merge branch 'py/git-git-extra-stuff' faf420e05a treewide: correct several "up-to-date" to "up to date" b71c6c3b64 Fix build with core.autocrlf=true 16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff 26e3d1cbea .mailmap: update email address of Andrey Mazo 27ea41c0b4 t/helper: ignore only executable files 7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias() 83e3ad3b12 merge-recursive: symlink's descendants not in way 34933d0eff stash: make sure to write refreshed cache e080b34540 merge: use refresh_and_write_cache 22184497a3 factor out refresh_and_write_cache function 7371612255 commit-graph: add --[no-]progress to write and verify 47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW 253bfe49bd SubmittingPatches: git-gui has a new maintainer d17ae00c97 hg-to-git: make it compatible with both python3 and python2 4c86140027 Third batch f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http' 627b826834 Merge branch 'md/list-objects-filter-combo' b9ac6c59b8 Merge branch 'cc/multi-promisor' de67293e74 Merge branch 'sg/line-log-tree-diff-optim' 95486229e3 Merge branch 'sg/complete-configuration-variables' f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook' a2e524ecf3 Merge branch 'cb/curl-use-xmalloc' 128666753b Merge branch 'jk/drop-release-pack-memory' 917a319ea5 Merge branch 'js/rebase-r-strategy' 7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui 4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout() 0d4304c124 doc: fix reference to --ignore-submodules af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py 8a3a6817e2 Merge gitk to pick up emergency build fix 2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po 9027af58e2 Makefile: run coccicheck on more source files 43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES) 5dedf7de53 Makefile: define THIRD_PARTY_SOURCES 902b90cf42 clean: fix theoretical path corruption ca8b5390db clean: rewrap overly long line 09487f2cba clean: avoid removing untracked files in a nested git repository e86bbcf987 clean: disambiguate the definition of -d 3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run 29b577b960 dir: add commentary explaining match_pathspec_item's return value 89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case 404ebceda0 dir: also check directories for matching pathspecs a5e916c745 dir: fix off-by-one error in match_pathspec_item bbbb6b0b89 dir: fix typo in comment 7541cc5302 t7300: add testcases showing failure to clean specified pathspecs 0eb7c37a8a diff, log doc: small grammer, format, and language fixes 6fae6bd518 diff, log doc: say "patch text" instead of "patches" 2bb74b53a4 Test the progress display bbf47568ad Revert "progress: use term_clear_line()" cf6a2d2557 Makefile: strip leading ./ in $(LIB_H) b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup 689a146c91 commit-graph: use commit_list_count() 59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N" a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N" a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base" cf34337f98 list-objects-filter: give a more specific error sparse parsing error 4c96a77594 list-objects-filter: delay parsing of sparse oid 72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter 83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer 7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>` 226daba280 Doc/Makefile: give mansource/-version/-manual attributes 40e747e89d git-submodule.txt: fix AsciiDoc formatting error f6461b82b9 Documentation: fix build with Asciidoctor 2 3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk f7a8834ba4 Merge branch 'bp/amend-toggle-bind' ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit" 9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog beffae768a gitk: Add Chinese (zh_CN) translation 56d9cbe68b packfile: expose get_delta_base() bab28d9f97 builtin/pack-objects: report reused packfile objects 6c8ec8c30a Merge branch 'bw/commit-scrollbuffer' acfa495519 Merge branch 'bw/amend-checkbutton' da08d559b7 git-gui: add horizontal scrollbar to commit buffer ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton aeeb978ba6 completion: teach archive to use __gitcomp_builtin 2b9bd488ae completion: teach rebase to use __gitcomp_builtin d49dffde9a completion: add missing completions for log, diff, show 6abada1880 upload-pack: disable commit graph more gently for shallow traversal fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time 72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set 4fd39c76e6 doc: minor formatting fix 29f4332e66 Quit passing 'now' to date code c77abf0460 Merge branch 'py/revert-hunks-lines' 5a2bb62180 Merge branch 'bp/widget-focus-hotkeys' e07446ed5f git-gui: add hotkeys to set widget focus f981ec18cf cache-tree: do not lazy-fetch tentative tree f1d4a28250 Second batch c8ada15456 Merge branch 'bc/reread-attributes-during-rebase' 8f3ba423e7 Merge branch 'tg/t0021-racefix' a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email' d49c2c3466 Merge branch 'sb/userdiff-dts' 2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe' 4c49dd042d Merge branch 'nd/diff-parseopt' d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix' 8ce8a63b46 Merge branch 'ds/midx-expire-repack' 9437394661 Merge branch 'cb/fetch-set-upstream' af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix' fa9e7934c7 Merge branch 'bm/repository-layout-typofix' d1a251a1fa Merge branch 'en/checkout-mismerge-fix' e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental' f4f8dfe127 Merge branch 'ds/feature-macros' 4a12f89865 Merge branch 'jk/eoo' b4a1eec332 Merge branch 'jk/repo-init-cleanup' 70336bd50a Merge branch 'py/git-gui-do-quit' ad7c543e3b grep: skip UTF8 checks explicitly 0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration() b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration 4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor b7e1ba5649 git-merge-index.txt: wrap shell listing in "----" 38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----" 5371813768 git-ls-remote.txt: wrap shell listing in "----" 1925fe0c8a Documentation: wrap config listings in "----" 922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor 2017956a19 Documentation: wrap blocks with "--" dd2e50a84e commit-graph: turn off save_commit_buffer 67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits 806278dead commit-graph.c: handle corrupt/missing trees 16749b8dd2 commit-graph.c: handle commit parsing errors 23424ea759 t/t5318: introduce failing 'git commit-graph write' tests bf1e28e0ad builtin/rebase.c: Remove pointless message d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing bd482d6e33 t: use common $SQ variable 3a37876b5d pack-objects: drop packlist index_pos optimization 7e6b96c73b test-read-cache: drop namelen variable e4b369069e diff-delta: set size out-parameter to 0 for NULL delta 7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint f1cbd033e2 pack-objects: use object_id in packlist_alloc() 0dfed92dfd git-am: handle missing "author" when parsing commit 3960290675 ci: restore running httpd tests 6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests c77722b3ea use get_tagged_oid() dad3f0607b tag: factor out get_tagged_oid() 468ce99b77 unpack-trees: rename 'is_excluded_from_list()' 65edd96aec treewide: rename 'exclude' methods to 'pattern' 4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_' caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list' ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern' 483e861111 t9902: use a non-deprecated command for testing 9df53c5de6 Recommend git-filter-repo instead of git-filter-branch 7b6ad97939 t6006: simplify, fix, and optimize empty message test 50094ca45f config/format.txt: specify default value of format.coverLetter c1a6f21cd4 Doc: add more detail for git-format-patch 854b5cb46a t4014: stop losing return codes of git commands dd2b6b6860 t4014: remove confusing pipe in check_threading() 6bd26f58ea t4014: use test_line_count() where possible c6ec6dadba t4014: let sed open its own files f2e2fa8f60 t4014: drop redirections to /dev/null 460609cbd5 t4014: use indentable here-docs 92014b69bb t4014: remove spaces after redirect operators 0ab74e979c t4014: use sq for test case names cb46c40662 t4014: move closing sq onto its own line b562a54c01 t4014: s/expected/expect/ e770fbfeff t3005: remove unused variable da280f5f1a t: use LF variable defined in the test harness 7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch 552fc5016f mingw: apply array.cocci rule 476998d05b t3427: accelerate this test by using fast-export and fast-import aac6ff7b5b .gitignore: stop ignoring `.manifest` files 2c65d90f75 am: reload .gitattributes after patching it 1577dc0f7c tree: simplify parse_tree_indirect() 50f26bd035 fetch: add fetch.writeCommitGraph config setting 8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set 27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options 0a8bc7068f clarify documentation for remote helpers 80e3658647 help: make help_unknown_ref() NORETURN 313677627a checkout: add simple check for 'git checkout -b' 3441de5b9c gitk: Make web links clickable a4fa2f0a4c git-gui: allow undoing last revert 414d924beb rebase: teach rebase --keep-base 6330209d7d rebase tests: test linear branch topology 4effc5bc96 rebase: fast-forward --fork-point in more cases c0efb4c1dd rebase: fast-forward --onto in more cases 2b318aa6c3 rebase: refactor can_fast_forward into goto tower c9efc21683 t3432: test for --no-ff's interaction with fast-forward 1ebec8dfc1 fast-import: duplicate into history rather than passing ownership 9756082b3c fast-import: duplicate parsed encoding string 86ae43da6a status: mention --skip for revert and cherry-pick b1b16bba96 completion: add --skip for cherry-pick and revert deaa65a754 completion: merge options for cherry-pick and revert 4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests 793ac7e309 t3432: test rebase fast-forward behavior 359ecebc34 t3431: add rebase --fork-point tests 502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage ff61681b46 grep: refactor and simplify PCRE1 support 8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1 1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning() fd99c2dd9b grep: use return value of strbuf_detach() 82f51af345 log-tree: always use return value of strbuf_detach() 7e92756751 http: don't leak urlmatch_config.vars 9784f97321 commit: free the right buffer in release_commit_memory ce17feb1b3 path: add a function to check for path suffix 60d198d022 banned.h: fix vsprintf()'s ban message 60fe477a0b notes: avoid potential use-after-free during insertion 779ad6641b notes: avoid leaking duplicate entries 4e1a641ee3 mingw: fix launching of externals from Unicode paths 5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly e2683d51d9 Fix .git/ discovery at the root of UNC shares d17f2124a7 setup_git_directory(): handle UNC paths correctly ebb8d2c90f mingw: support UNC in git clone file://server/share/repo 0c37c41d13 t4009: make hash size independent c1f3dfcc23 t4002: make hash independent 8cc5ff83c3 t4000: make hash size independent c784815073 t3903: abstract away SHA-1-specific constants 2ccdfb1c78 git-gui: return early when patch fails to apply 62bd99934b git-gui: allow reverting selected hunk 5f0a516de9 git-gui: allow reverting selected lines fddf2ebe38 transport: teach all vtables to allow fetch first ac3fda82bf transport-helper: skip ls-refs if unnecessary 745f681289 First batch after Git 2.23 d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg' 22e86e85cb Merge branch 'en/fast-import-merge-doc' 9c7573581c Merge branch 'jk/perf-no-dups' 4336fdb2ef Merge branch 'rs/nedalloc-fixlets' 8ae7a46c4d Merge branch 'sg/show-failed-test-names' 6ba06b582b Merge branch 'sg/commit-graph-validate' 072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix' 207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix' 77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests' 1b01cdbf2e Merge branch 'jk/tree-walk-overflow' 8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix' 307179732d Merge branch 'mt/grep-submodules-working-tree' 58166c2e9d t0021: make sure clean filter runs 8b3f33ef11 ref-filter: initialize empty name or email fields 3c81760bc6 userdiff: add a builtin pattern for dts files fe49814409 t4014: drop unnecessary blank lines from test cases a2bb801f6a line-log: avoid unnecessary full tree diffs eef5204190 line-log: extract pathspec parsing from line ranges into a helper function a63694f523 diff: skip GITLINK when lazy fetching missing objs 7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe 19800bdc3f parseopt: move definition of enum parse_opt_result up 415b770b88 packfile.h: drop extern from function declaration acb49d1cc8 t3800: make hash-size independent ca6ba94200 t3600: make hash size independent 19ce5496c2 t3506: make hash independent 9a6738c061 t3430: avoid hard-coded object IDs 4dd1b5f90f t3404: abstract away SHA-1-specific constants b99bfc7a6c t3306: abstract away SHA-1-specific constants e3e9d02e35 t3305: make hash size independent b408cf8cf6 t3301: abstract away SHA-1-specific constants b561edd213 t3206: abstract away hash size constants a5f61c7d13 t3201: abstract away SHA-1-specific constants 1c24a54ea4 repository-layout.txt: correct pluralization of 'object' b0a3186140 sequencer: simplify root commit creation a47ba3c777 rebase -i: check for updated todo after squash and reword 450efe2d53 rebase -i: always update HEAD before rewording c581e4a749 grep: under --debug, show whether PCRE JIT is enabled aaa95dfa05 midx: switch to using the_hash_algo be8e172e9f builtin/show-index: replace sha1_to_hex 3f34d70d40 rerere: replace sha1_to_hex fc06be3b7f builtin/receive-pack: replace sha1_to_hex 69fa337060 builtin/index-pack: replace sha1_to_hex 3a4d7aa5ae packfile: replace sha1_to_hex e0cb7cdb89 wt-status: convert struct wt_status to object_id 8d4d86b0f0 cache: remove null_sha1 f6ca67d673 builtin/worktree: switch null_sha1 to null_oid dd336a5511 builtin/repack: write object IDs of the proper length 894c0f66bb pack-write: use hash_to_hex when writing checksums 4439c7a360 sequencer: convert to use the_hash_algo 95518faac1 bisect: switch to using the_hash_algo e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo fe9fec45f6 config: use the_hash_algo in abbrev comparison 976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo 703d2d4193 bundle: switch to use the_hash_algo 9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo 7962e046ff show-index: switch hard-coded constants to the_hash_algo fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ 7e0d029f18 builtin/rev-parse: switch to use the_hash_algo 319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo f6af19a9ad fetch-pack: use parse_oid_hex 36261e42ec patch-id: convert to use the_hash_algo 28ba1830d0 builtin/replace: make hash size independent 24bc1a1292 pull, fetch: add --set-upstream option 71d41ff651 archive-tar: turn length miscalculation warning into BUG 17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header() 82a46af13e archive-tar: fix pax extended header length calculation 4060c1990a archive-tar: report wrong pax extended header length 4615a8cb5b merge-recursive: alphabetize include list 45ef16f77a merge-recursive: add sanity checks for relevant merge_options f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* 5bf7e5779e merge-recursive: split internal fields into a separate struct e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output a779fb829b merge-recursive: comment and reorder the merge_options fields 8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options 7c0a6c8e47 merge-recursive: move some definitions around to clean up the header c749ab1da8 merge-recursive: rename merge_options argument to opt in header bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list 4d7101e25c merge-recursive: fix some overly long lines 724dd767b2 cache-tree: share code between functions writing an index as a tree 345480d1ed merge-recursive: don't force external callers to do our logging b4db8a2b76 merge-recursive: remove useless parameter in merge_trees() 98a1d3d888 merge-recursive: exit early if index != head 9822175d2b Ensure index matches head before invoking merge machinery, round N 10f751c06b merge-recursive: remove another implicit dependency on the_repository f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks 8e01251694 merge-recursive: introduce an enum for detect_directory_renames values 743474cbfa merge-recursive: provide a better label for diff3 common ancestor 51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u) 5bace62582 l10n: Update Catalan translation 139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees() 65c01c6442 checkout: provide better conflict hunk description with detached HEAD d8523ca1b9 merge-recursive: be consistent with assert acb7da05ac checkout: remove duplicate code 93b980e58f http: use xmalloc with cURL 64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental aaf633c2ad repo-settings: create feature.experimental setting c6cc4c5afd repo-settings: create feature.manyFiles setting ad0fb65999 repo-settings: parse core.untrackedCache 31b1de6a09 commit-graph: turn on commit-graph by default b068d9a250 t6501: use 'git gc' in quiet mode 7211b9e753 repo-settings: consolidate some config settings 507e5470a0 worktree remove: clarify error message on dirty worktree 5af9d5f6c8 completion: complete config variables and values for 'git clone --config=' 88cd790d6a completion: complete config variables names and values for 'git clone -c' dd33472831 completion: complete values of configuration variables after 'git -c var=' e1e00089da completion: complete configuration sections and variable names for 'git -c' 42d0efec59 completion: split _git_config() d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp() 2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names d9438873c4 completion: deduplicate configuration sections 7a09a8f093 completion: add tests for 'git config' completion 840d7e5b3c completion: complete more values of more 'color.*' configuration variables 08a12175d8 completion: fix a typo in a comment 9827d4c185 packfile: drop release_pack_memory() d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed 362f8b280c t/perf: rename duplicate-numbered test script 742ed63345 trace2: cleanup whitespace in perf format e34430556c trace2: cleanup whitespace in normal format c2b890aca5 quote: add sq_append_quote_argv_pretty() ad43e37839 trace2: trim trailing whitespace in normal format error message 04f10d332f trace2: remove dead code in maybe_add_string_va() da4589ce7e trace2: trim whitespace in region messages in perf target format 0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit 5440eb0ea2 git-gui: call do_quit before destroying the main window bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook 6098817fd7 git-merge: honor pre-merge-commit hook a1f3dd7eb3 merge: do no-verify like commit f78f6c7e0c t7503: verify proper hook execution 70597e8386 nedmalloc: avoid compiler warning about unused value c9b9c09dae nedmalloc: do assignments only after the declaration section 22932d9169 config: stop checking whether the_repository is NULL 5732f2b1ef common-main: delay trace2 initialization 58ebccb478 t1309: use short branch name in includeIf.onbranch test 67feca3b1c gitcli: document --end-of-options 51b4594b40 parse-options: allow --end-of-options as a synonym for "--" 19e8789b23 revision: allow --end-of-options to end option parsing ffe1afe67c tests: show the test name and number at the start of verbose output 96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests 7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits' 39d8831856 commit-graph: turn a group of write-related macro flags into an enum 9916073be5 t5318-commit-graph: use 'test_expect_code' 620c09e1b6 restore: add test for deleted ita files ecd72042de checkout.c: unstage empty deleted ita files a613d4f817 pack-refs: always refresh after taking the lock file decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd' 371df1bea9 trace2: cleanup column alignment in perf target format 5aa02f9868 tree-walk: harden make_traverse_path() length computations c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path() b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len() 37806080d7 tree-walk: use size_t consistently 7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh' 12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh' 9055384710 tree-walk: drop oid from traverse_info 947208b725 setup_traverse_info(): stop copying oid e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto` a63f990d92 t3418: test `rebase -r` with merge strategies 5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges` e145d99347 rebase -r: support merge strategies other than `recursive` 4e6023b13a t3427: fix another incorrect assumption f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced a9c71073da t3427: fix erroneous assumption b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case c248d32cdb t3427: simplify the `setup` test case significantly 8c1e24048a t3427: add a clarifying comment 5efed0ecf9 rebase: fold git-rebase--common into the -p backend 68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone 2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive` 6180b20239 t3400: stop referring to the scripted rebase d5b581f228 Drop unused git-rebase--am.sh 814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation 6a289d45c0 grep: fix worktree case in submodules 870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching 8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data 09872f6418 grep: create a "is_fixed" member in "grep_pat" 8a35b540a9 grep: consistently use "p->fixed" in compile_regexp() 685668faaa grep: stop using a custom JIT stack with PCRE v1 34489239d0 grep: stop "using" a custom JIT stack with PCRE v2 04bef50c01 grep: remove overly paranoid BUG(...) code b65abcafc7 grep: use PCRE v2 for optimized fixed-string search 48de2a768c grep: remove the kwset optimization 45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern> 25754125ce grep: make the behavior for NUL-byte in patterns sane d316af059d grep tests: move binary pattern tests into their own file 471dac5d2c grep tests: move "grep binary" alongside the rest f463beb805 grep: inline the return value of a function call used only once b14cf112e2 t4210: skip more command-line encoding tests on MinGW 44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>" 4e2443b181 log tests: test regex backends in "--encode=<enc>" tests 90d21f9ebf list-objects-filter-options: make parser void 5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW 489fc9ee71 list-objects-filter-options: allow mult. --filter c2694952e3 strbuf: give URL-encoding API a char predicate fn cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list f56f764279 list-objects-filter-options: move error check up e987df5fe6 list-objects-filter: implement composite filters 842b00516a list-objects-filter-options: always supply *errbuf 7a7c7f4a6d list-objects-filter: put omits set in filter struct 9430147ca0 list-objects-filter: encapsulate filter components 4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c 60b7a92d84 Move repository_format_partial_clone to promisor-remote.c db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h} 75de085211 remote: add promisor and partial clone config to the doc 7e154badc0 partial-clone: add multiple remotes in the doc 9a4c507886 t0410: test fetching from many promisor remotes 5e46139376 builtin/fetch: remove unique promisor remote limitation fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote() faf2abf496 promisor-remote: use repository_format_partial_clone 9cfebc1f3b promisor-remote: add promisor_remote_reinit() 9e27beaa23 promisor-remote: implement promisor_remote_get_direct() 48de315817 Add initial support for many promisor remotes 2e860675b6 fetch-object: make functions return an error code c59c7c879e t0410: remove pipes after git commands git-subtree-dir: third_party/git git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
msgid "invalid ident line: %.*s"
msgstr "无效的身份标识:%.*s"
#: builtin/am.c:1299
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
#: builtin/am.c:1496
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
#: builtin/am.c:1498
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引来重建一个(三方合并的)基础目录树..."
#: builtin/am.c:1517
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
"您是否曾手动编辑过您的补丁?\n"
"无法应用补丁到索引中的数据对象上。"
#: builtin/am.c:1523
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基础版本上打补丁及进行三方合并..."
#: builtin/am.c:1549
msgid "Failed to merge in the changes."
msgstr "无法合并变更。"
#: builtin/am.c:1581
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
#: builtin/am.c:1628 builtin/am.c:1632
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续:%s 不存在。"
#: builtin/am.c:1650
msgid "Commit Body is:"
msgstr "提交内容为:"
# 译者:注意保持句尾空格
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
#.
#: builtin/am.c:1660
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]"
#: builtin/am.c:1710
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "脏索引:不能应用补丁(脏文件:%s"
#: builtin/am.c:1750 builtin/am.c:1818
#, c-format
msgid "Applying: %.*s"
msgstr "应用:%.*s"
#: builtin/am.c:1767
msgid "No changes -- Patch already applied."
msgstr "没有变更 —— 补丁已经应用过。"
#: builtin/am.c:1773
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补丁失败于 %s %.*s"
#: builtin/am.c:1777
msgid "Use 'git am --show-current-patch' to see the failed patch"
msgstr "用 'git am --show-current-patch' 命令查看失败的补丁"
#: builtin/am.c:1821
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
"没有变更 —— 您是不是忘了执行 'git add'\n"
"如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n"
"您也许想要跳过这个补丁。"
#: builtin/am.c:1828
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
"such.\n"
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
"在您的索引中仍存在未合并的路径。\n"
"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
#: builtin/reset.c:337
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
#: builtin/am.c:1987
msgid "failed to clean index"
msgstr "清空索引失败"
#: builtin/am.c:2031
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
#: builtin/am.c:2128
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值:%s"
#: builtin/am.c:2164
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
#: builtin/am.c:2165
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
#: builtin/am.c:2171
msgid "run interactively"
msgstr "以交互式方式运行"
#: builtin/am.c:2173
msgid "historical option -- no-op"
msgstr "老的参数 —— 无作用"
#: builtin/am.c:2175
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要,允许使用三方合并。"
#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
#: builtin/repack.c:296 builtin/stash.c:806
msgid "be quiet"
msgstr "静默模式"
#: builtin/am.c:2178
msgid "add a Signed-off-by line to the commit message"
msgstr "在提交说明中添加一个 Signed-off-by 签名"
#: builtin/am.c:2181
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集(默认)"
#: builtin/am.c:2183
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -k 参数"
#: builtin/am.c:2185
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -b 参数"
#: builtin/am.c:2187
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -m 参数"
#: builtin/am.c:2189
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
#: builtin/am.c:2192
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
#: builtin/am.c:2195
msgid "strip everything before a scissors line"
msgstr "丢弃裁切线前的所有内容"
#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
#: builtin/am.c:2224
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
#: parse-options.h:141 parse-options.h:162 parse-options.h:312
msgid "n"
msgstr "n"
#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
msgid "format"
msgstr "格式"
#: builtin/am.c:2221
msgid "format the patch(es) are in"
msgstr "补丁的格式"
#: builtin/am.c:2227
msgid "override error message when patch failure occurs"
msgstr "打补丁失败时显示的错误信息"
#: builtin/am.c:2229
msgid "continue applying patches after resolving a conflict"
msgstr "冲突解决后继续应用补丁"
#: builtin/am.c:2232
msgid "synonyms for --continue"
msgstr "和 --continue 同义"
#: builtin/am.c:2235
msgid "skip the current patch"
msgstr "跳过当前补丁"
#: builtin/am.c:2238
msgid "restore the original branch and abort the patching operation."
msgstr "恢复原始分支并终止打补丁操作。"
#: builtin/am.c:2241
msgid "abort the patching operation but keep HEAD where it is."
msgstr "终止补丁操作但保持 HEAD 不变。"
#: builtin/am.c:2244
msgid "show the patch being applied."
msgstr "显示正在应用的补丁。"
#: builtin/am.c:2248
msgid "lie about committer date"
msgstr "将作者日期作为提交日期"
#: builtin/am.c:2250
msgid "use current timestamp for author date"
msgstr "用当前时间作为作者日期"
#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
msgid "key-id"
msgstr "key-id"
#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
msgid "GPG-sign commits"
msgstr "使用 GPG 签名提交"
#: builtin/am.c:2256
msgid "(internal use for git-rebase)"
msgstr "(内部使用,用于 git-rebase"
#: builtin/am.c:2274
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
"参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n"
"请不要再使用它了。"
#: builtin/am.c:2281
msgid "failed to read the index"
msgstr "读取索引失败"
#: builtin/am.c:2296
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
#: builtin/am.c:2320
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
"发现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
#: builtin/am.c:2326
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行,我们不会继续。"
#: builtin/am.c:2336
msgid "interactive mode requires patches on the command line"
msgstr "交互式模式需要命令行上提供补丁"
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<选项>] [<补丁>...]"
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
msgstr "不能创建归档文件 '%s'"
#: builtin/archive.c:20
msgid "could not redirect output"
msgstr "不能重定向输出"
#: builtin/archive.c:37
msgid "git archive: Remote with no URL"
msgstr "git archive未提供远程 URL"
#: builtin/archive.c:61
msgid "git archive: expected ACK/NAK, got a flush packet"
msgstr "git archive期望是 ACK/NAK却得到 flush 包"
#: builtin/archive.c:64
#, c-format
msgid "git archive: NACK %s"
msgstr "git archiveNACK %s"
#: builtin/archive.c:65
msgid "git archive: protocol error"
msgstr "git archive协议错误"
#: builtin/archive.c:69
msgid "git archive: expected a flush"
msgstr "git archive应有一个 flush 包"
#: builtin/bisect--helper.c:22
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
#: builtin/bisect--helper.c:23
msgid "git bisect--helper --write-terms <bad_term> <good_term>"
msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>"
#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-clean-state"
msgstr "git bisect--helper --bisect-clean-state"
#: builtin/bisect--helper.c:25
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<提交>]"
#: builtin/bisect--helper.c:26
msgid ""
"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
"<bad_term>"
msgstr ""
"git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语"
">"
#: builtin/bisect--helper.c:27
msgid ""
"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
"<bad_term>"
msgstr ""
"git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>"
#: builtin/bisect--helper.c:28
msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
msgstr "git bisect--helper --bisect-next-check <好-术语> <坏-术语> [<术语>]"
#: builtin/bisect--helper.c:29
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
msgstr ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
#: builtin/bisect--helper.c:30
msgid ""
"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
msgstr ""
"git bisect--helper --bisect-start [--term-{old,good}=<术语> --term-{new,bad}"
"=<术语>][--no-checkout] [<坏> [<好>...]] [--] [<路径>...]"
#: builtin/bisect--helper.c:86
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' 不是一个有效的术语"
#: builtin/bisect--helper.c:90
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "不能使用内置命令 '%s' 作为术语"
#: builtin/bisect--helper.c:100
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "不能修改术语 '%s' 的含义"
#: builtin/bisect--helper.c:111
msgid "please use two different terms"
msgstr "请使用两个不同的术语"
#: builtin/bisect--helper.c:118
msgid "could not open the file BISECT_TERMS"
msgstr "不能打开文件 BISECT_TERMS"
#: builtin/bisect--helper.c:155
#, c-format
msgid "We are not bisecting.\n"
msgstr "我们没有在二分查找。\n"
#: builtin/bisect--helper.c:163
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' 不是一个有效的提交"
#: builtin/bisect--helper.c:174
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
#: builtin/bisect--helper.c:215
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "坏的 bisect_write 参数:%s"
#: builtin/bisect--helper.c:220
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "无法获取版本 '%s' 的对象 ID"
#: builtin/bisect--helper.c:232
#, c-format
msgid "couldn't open the file '%s'"
msgstr "无法打开文件 '%s'"
#: builtin/bisect--helper.c:258
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "无效的命令:您当前正处于一个 %s/%s 二分查找中"
#: builtin/bisect--helper.c:285
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
"您需要给我至少一个 %s 和一个 %s 版本。\n"
"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
#: builtin/bisect--helper.c:289
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
"You then need to give me at least one %s and %s revision.\n"
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
"您需要执行 \"git bisect start\" 来开始。\n"
"然后需要提供我至少一个 %s 和一个 %s 版本。\n"
"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
#: builtin/bisect--helper.c:321
#, c-format
msgid "bisecting only with a %s commit"
msgstr "在只有一个 %s 提交的情况下二分查找"
# 译者:注意保持句尾空格
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
#.
#: builtin/bisect--helper.c:329
msgid "Are you sure [Y/n]? "
msgstr "您确认么[Y/n] "
#: builtin/bisect--helper.c:376
msgid "no terms defined"
msgstr "未定义术语"
#: builtin/bisect--helper.c:379
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
"and %s for the new state.\n"
msgstr "您当前针对旧状态的术语是 %s对新状态的术语是 %s。\n"
#: builtin/bisect--helper.c:389
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
"命令 'git bisect terms' 的参数 %s 无效。\n"
"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
#: builtin/bisect--helper.c:475
#, c-format
msgid "unrecognized option: '%s'"
msgstr "未识别的选项:'%s'"
#: builtin/bisect--helper.c:479
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' 看起来不是一个有效的版本"
#: builtin/bisect--helper.c:511
msgid "bad HEAD - I need a HEAD"
msgstr "坏的 HEAD - 我需要一个 HEAD"
#: builtin/bisect--helper.c:526
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
#: builtin/bisect--helper.c:547
msgid "won't bisect on cg-seek'ed tree"
msgstr "不会在做了 cg-seek 的树上做二分查找"
#: builtin/bisect--helper.c:550
msgid "bad HEAD - strange symbolic ref"
msgstr "坏的 HEAD - 奇怪的符号引用"
#: builtin/bisect--helper.c:574
#, c-format
msgid "invalid ref: '%s'"
msgstr "无效的引用:'%s'"
#: builtin/bisect--helper.c:630
msgid "perform 'git bisect next'"
msgstr "执行 'git bisect next'"
#: builtin/bisect--helper.c:632
msgid "write the terms to .git/BISECT_TERMS"
msgstr "将术语写入 .git/BISECT_TERMS"
#: builtin/bisect--helper.c:634
msgid "cleanup the bisection state"
msgstr "清除二分查找状态"
#: builtin/bisect--helper.c:636
msgid "check for expected revs"
msgstr "检查预期的版本"
#: builtin/bisect--helper.c:638
msgid "reset the bisection state"
msgstr "清除二分查找状态"
#: builtin/bisect--helper.c:640
msgid "write out the bisection state in BISECT_LOG"
msgstr "将二分查找的状态写入 BISECT_LOG"
#: builtin/bisect--helper.c:642
msgid "check and set terms in a bisection state"
msgstr "在一个二分查找状态中检查和设置术语"
#: builtin/bisect--helper.c:644
msgid "check whether bad or good terms exist"
msgstr "检查坏的或好的术语是否存在"
#: builtin/bisect--helper.c:646
msgid "print out the bisect terms"
msgstr "打印二分查找术语"
#: builtin/bisect--helper.c:648
msgid "start the bisect session"
msgstr "启动二分查找过程"
#: builtin/bisect--helper.c:650
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "更新 BISECT_HEAD 而非检出当前提交"
#: builtin/bisect--helper.c:652
msgid "no log for BISECT_WRITE"
msgstr "BISECT_WRITE 无日志"
#: builtin/bisect--helper.c:669
msgid "--write-terms requires two arguments"
msgstr "--write-terms 需要两个参数"
#: builtin/bisect--helper.c:673
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state 不带参数"
#: builtin/bisect--helper.c:680
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset 无需参数或者需要一个提交"
#: builtin/bisect--helper.c:684
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr "--bisect-write 需要 4 或 5 个参数"
#: builtin/bisect--helper.c:690
msgid "--check-and-set-terms requires 3 arguments"
msgstr "--check-and-set-terms 需要 3 个参数"
#: builtin/bisect--helper.c:696
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check 需要 2 或 3 个参数"
#: builtin/bisect--helper.c:702
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms 需要 0 或 1 个参数"
#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "期望一个颜色:%s"
#: builtin/blame.c:417
msgid "must end with a color"
msgstr "必须以一个颜色结尾"
#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "设置 blame.coloring 中的无效取值"
#: builtin/blame.c:823
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "不能找到要忽略的版本 %s"
#: builtin/blame.c:845
msgid "Show blame entries as we find them, incrementally"
msgstr "增量式地显示发现的 blame 条目"
#: builtin/blame.c:846
msgid "Show blank SHA-1 for boundary commits (Default: off)"
msgstr "边界提交显示空的 SHA-1默认关闭"
#: builtin/blame.c:847
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "不把根提交作为边界(默认:关闭)"
#: builtin/blame.c:848
msgid "Show work cost statistics"
msgstr "显示命令消耗统计"
#: builtin/blame.c:849
msgid "Force progress reporting"
msgstr "强制进度显示"
#: builtin/blame.c:850
msgid "Show output score for blame entries"
msgstr "显示判断 blame 条目位移的得分诊断信息"
#: builtin/blame.c:851
msgid "Show original filename (Default: auto)"
msgstr "显示原始文件名(默认:自动)"
#: builtin/blame.c:852
msgid "Show original linenumber (Default: off)"
msgstr "显示原始的行号(默认:关闭)"
#: builtin/blame.c:853
msgid "Show in a format designed for machine consumption"
msgstr "显示为一个适合机器读取的格式"
#: builtin/blame.c:854
msgid "Show porcelain format with per-line commit information"
msgstr "为每一行显示机器适用的提交信息"
#: builtin/blame.c:855
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
#: builtin/blame.c:856
msgid "Show raw timestamp (Default: off)"
msgstr "显示原始时间戳(默认:关闭)"
#: builtin/blame.c:857
msgid "Show long commit SHA1 (Default: off)"
msgstr "显示长的 SHA1 提交号(默认:关闭)"
#: builtin/blame.c:858
msgid "Suppress author name and timestamp (Default: off)"
msgstr "隐藏作者名字和时间戳(默认:关闭)"
#: builtin/blame.c:859
msgid "Show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而不是名字(默认:关闭)"
#: builtin/blame.c:860
msgid "Ignore whitespace differences"
msgstr "忽略空白差异"
#: builtin/blame.c:861 builtin/log.c:1629
msgid "rev"
msgstr "版本"
#: builtin/blame.c:861
msgid "Ignore <rev> when blaming"
msgstr "在执行 blame 操作时忽略 <版本>"
#: builtin/blame.c:862
msgid "Ignore revisions from <file>"
msgstr "忽略来自 <文件> 中的版本"
#: builtin/blame.c:863
msgid "color redundant metadata from previous line differently"
msgstr "使用颜色间隔输出与前一行不同的重复元信息"
#: builtin/blame.c:864
msgid "color lines by age"
msgstr "依据时间着色"
#: builtin/blame.c:871
msgid "Use an experimental heuristic to improve diffs"
msgstr "使用一个试验性的启发式算法改进差异显示"
#: builtin/blame.c:873
msgid "Spend extra cycles to find better match"
msgstr "花费额外的循环来找到更好的匹配"
#: builtin/blame.c:874
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
#: builtin/blame.c:875
msgid "Use <file>'s contents as the final image"
msgstr "使用 <文件> 的内容作为最终的图片"
#: builtin/blame.c:876 builtin/blame.c:877
msgid "score"
msgstr "得分"
#: builtin/blame.c:876
msgid "Find line copies within and across files"
msgstr "找到文件内及跨文件的行拷贝"
#: builtin/blame.c:877
msgid "Find line movements within and across files"
msgstr "找到文件内及跨文件的行移动"
#: builtin/blame.c:878
msgid "n,m"
msgstr "n,m"
#: builtin/blame.c:878
msgid "Process only line range n,m, counting from 1"
msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
#: builtin/blame.c:929
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
#. TRANSLATORS: This string is used to tell us the
#. maximum display width for a relative timestamp in
#. "git blame" output. For C locale, "4 years, 11
#. months ago", which takes 22 places, is the longest
#. among various forms of relative timestamps, but
#. your language may need more or fewer display
#. columns.
#.
#: builtin/blame.c:980
msgid "4 years, 11 months ago"
msgstr "4 年 11 个月前"
#: builtin/blame.c:1087
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "文件 %s 只有 %lu 行"
msgstr[1] "文件 %s 只有 %lu 行"
#: builtin/blame.c:1133
msgid "Blaming lines"
msgstr "追踪代码行"
#: builtin/branch.c:29
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
#: builtin/branch.c:30
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
#: builtin/branch.c:31
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
#: builtin/branch.c:32
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
#: builtin/branch.c:33
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
#: builtin/branch.c:34
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<选项>] [-r | -a] [--points-at]"
#: builtin/branch.c:35
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<选项>] [-r | -a] [--format]"
# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
#: builtin/branch.c:154
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
"将要删除的分支 '%s' 已经被合并到\n"
" '%s',但未合并到 HEAD。"
# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
#: builtin/branch.c:158
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
"并未删除分支 '%s' 虽然它已经合并到 HEAD\n"
" 然而却尚未被合并到分支 '%s' 。"
#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指向的提交对象"
#: builtin/branch.c:176
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
"分支 '%s' 没有完全合并。\n"
"如果您确认要删除它,执行 'git branch -D %s'。"
#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "更新配置文件失败"
#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "不能将 -a 和 -d 同时使用"
#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指向的提交对象"
#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "未能找到远程跟踪分支 '%s'。"
#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未发现。"
#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "无法删除远程跟踪分支 '%s'"
#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "无法删除分支 '%s'"
#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "已删除远程跟踪分支 %s曾为 %s。\n"
#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s曾为 %s。\n"
#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "不能解析格式化字符串"
#: builtin/branch.c:460
msgid "could not resolve HEAD"
msgstr "不能解析 HEAD 提交"
#: builtin/branch.c:466
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) 指向 refs/heads/ 之外"
#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "分支 %s 正被变基到 %s"
#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "分支 %s 正被二分查找于 %s"
#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr "无法拷贝当前分支因为不处于任何分支上。"
#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr "无法重命名当前分支因为不处于任何分支上。"
#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名:'%s'"
#: builtin/branch.c:542
msgid "Branch rename failed"
msgstr "分支重命名失败"
#: builtin/branch.c:544
msgid "Branch copy failed"
msgstr "分支拷贝失败"
#: builtin/branch.c:548
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "已为错误命名的分支 '%s' 创建了一个副本"
#: builtin/branch.c:551
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "已将错误命名的分支 '%s' 重命名"
#: builtin/branch.c:557
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s但 HEAD 没有更新!"
#: builtin/branch.c:566
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重命名,但更新配置文件失败"
#: builtin/branch.c:568
msgid "Branch is copied, but update of config-file failed"
msgstr "分支已拷贝,但更新配置文件失败"
#: builtin/branch.c:584
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Lines starting with '%c' will be stripped.\n"
msgstr ""
"请编辑分支的描述\n"
" %s\n"
"以 '%c' 开头的行将被过滤。\n"
#: builtin/branch.c:618
msgid "Generic options"
msgstr "通用选项"
#: builtin/branch.c:620
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
#: builtin/branch.c:621
msgid "suppress informational messages"
msgstr "不显示信息"
#: builtin/branch.c:622
msgid "set up tracking mode (see git-pull(1))"
msgstr "设置跟踪模式(参见 git-pull(1)"
#: builtin/branch.c:624
msgid "do not use"
msgstr "不要使用"
#: builtin/branch.c:626 builtin/rebase.c:485
msgid "upstream"
msgstr "上游"
#: builtin/branch.c:626
msgid "change the upstream info"
msgstr "改变上游信息"
#: builtin/branch.c:627
msgid "Unset the upstream info"
msgstr "取消上游信息的设置"
#: builtin/branch.c:628
msgid "use colored output"
msgstr "使用彩色输出"
#: builtin/branch.c:629
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
#: builtin/branch.c:631 builtin/branch.c:633
msgid "print only branches that contain the commit"
msgstr "只打印包含该提交的分支"
#: builtin/branch.c:632 builtin/branch.c:634
msgid "print only branches that don't contain the commit"
msgstr "只打印不包含该提交的分支"
#: builtin/branch.c:637
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作:"
#: builtin/branch.c:638
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪及本地分支"
#: builtin/branch.c:640
msgid "delete fully merged branch"
msgstr "删除完全合并的分支"
#: builtin/branch.c:641
msgid "delete branch (even if not merged)"
msgstr "删除分支(即使没有合并)"
#: builtin/branch.c:642
msgid "move/rename a branch and its reflog"
msgstr "移动/重命名一个分支,以及它的引用日志"
#: builtin/branch.c:643
msgid "move/rename a branch, even if target exists"
msgstr "移动/重命名一个分支,即使目标已存在"
#: builtin/branch.c:644
msgid "copy a branch and its reflog"
msgstr "拷贝一个分支和它的引用日志"
#: builtin/branch.c:645
msgid "copy a branch, even if target exists"
msgstr "拷贝一个分支,即使目标已存在"
#: builtin/branch.c:646
msgid "list branch names"
msgstr "列出分支名"
#: builtin/branch.c:647
msgid "show current branch name"
msgstr "显示当前分支名"
#: builtin/branch.c:648
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
#: builtin/branch.c:650
msgid "edit the description for the branch"
msgstr "标记分支的描述"
#: builtin/branch.c:651
msgid "force creation, move/rename, deletion"
msgstr "强制创建、移动/重命名、删除"
#: builtin/branch.c:652
msgid "print only branches that are merged"
msgstr "只打印已经合并的分支"
#: builtin/branch.c:653
msgid "print only branches that are not merged"
msgstr "只打印尚未合并的分支"
#: builtin/branch.c:654
msgid "list branches in columns"
msgstr "以列的方式显示分支"
#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
#: builtin/tag.c:433
msgid "object"
msgstr "对象"
#: builtin/branch.c:658
msgid "print only branches of the object"
msgstr "只打印指向该对象的分支"
#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
msgid "sorting and filtering are case insensitive"
msgstr "排序和过滤属于大小写不敏感"
#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "输出格式"
#: builtin/branch.c:684 builtin/clone.c:761
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下!"
#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不兼容"
#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "必须提供分支名"
#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "不能向分离头指针提供描述"
#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "不能为一个以上的分支编辑描述"
#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚无提交。"
#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "为拷贝操作提供了太多的分支名"
#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "为重命名操作提供了太多的参数"
#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "为设置新上游提供了太多的参数"
#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "无法设置 HEAD 的上游为 %s因为 HEAD 没有指向任何分支。"
#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "为取消上游设置操作提供了太多的参数"
#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信息"
#: builtin/branch.c:841
msgid ""
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"
msgstr ""
"'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
"您是否想要使用:-a|-r --list <模式>"
#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgstr ""
"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
#: builtin/bundle.c:45
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96 af6b65d45e Git 2.26.2 7397ca3373 Git 2.25.4 b86a4be245 Git 2.24.3 f2771efd07 Git 2.23.3 c9808fa014 Git 2.22.4 9206d27eb5 Git 2.21.3 041bc65923 Git 2.20.4 76b54ee9b9 Git 2.19.5 ba6f0905fd Git 2.18.4 df5be6dc3f Git 2.17.5 1a3609e402 fsck: reject URL with empty host in .gitmodules e7fab62b73 credential: treat URL with empty scheme as invalid c44088ecc4 credential: treat URL without scheme as invalid fe29a9b7b0 credential: die() when parsing invalid urls a2b26ffb1a fsck: convert gitmodules url to URL passed to curl 8ba8ed568e credential: refuse to operate when missing host or protocol 24036686c4 credential: parse URL without host as empty host, not unset 73aafe9bc2 t0300: use more realistic inputs a88dbd2f8c t0300: make "quit" helper more realistic de49261b05 Git 2.26.1 274b9cc253 Git 2.26 55a7568606 Merge branch 'en/rebase-backend' c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git 1557364fb4 l10n: tr.po: change file mode to 644 2da1b05674 t3419: prevent failure when run with EXPENSIVE 1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0 5804c6ec40 l10n: de.po: add missing space 98cedd0233 Merge https://github.com/prati0100/git-gui 4914ba4bcf l10n: tr: Fix a couple of ambiguities a5728022e0 Merge branch 'py/remove-tcloo' 7fcb965970 RelNotes/2.26.0: fix various typos f0c03bcf95 l10n: Update Catalan translation 67b0a24910 Git 2.25.3 be8661a328 Sync with Git 2.25.2 0822e66b5d Git 2.25.2 65588b0b2e unicode: update the width tables to Unicode 13.0 7be274b0ff Merge branch 'js/ci-windows-update' into maint 9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint 221887a492 Merge branch 'jk/doc-credential-helper' into maint 32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint 618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint 50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint 41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint 2d7247af6f Merge branch 'am/mingw-poll-fix' into maint 4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint 76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint 569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint 16a4bf1035 Merge branch 'en/check-ignore' into maint 3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint 56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint 1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint 7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint 93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint 758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint 506223f9c5 Git 2.24.2 17a02783d8 Git 2.23.2 69fab82147 Git 2.22.3 fe22686494 Git 2.21.2 d1259ce117 Git 2.20.3 a5979d7009 Git 2.19.4 21a3e5016b Git 2.18.3 c42c0f1297 Git 2.17.4 d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u) 3891a84ccd git-gui: create a new namespace for chord script evaluation 8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5 440e7442d1 l10n: zh_CN: Revise v2.26.0 translation 2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2 6c85aac65f Git 2.26-rc2 74f172e39e Merge branch 'en/test-cleanup' e96327c947 Merge branch 'es/outside-repo-errmsg-hints' ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0 15fa8d9667 l10n: vi: fix translation + grammar 5c20398699 prefix_path: show gitdir if worktree unavailable 1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated) c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated) a4a2f64642 Merge branch 'js/askpass-coerce-utf8' 850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows d769dcc5cd Merge branch 'py/blame-status-error' 70e24186c0 t6022, t6046: fix flaky files-are-updated checks 30e9940356 Hopefully the final batch before -rc2 b4f0038525 Merge branch 'en/rebase-backend' 25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master 07259e74ec fsck: detect gitmodules URLs with embedded newlines c716fe4bd9 credential: detect unrepresentable values when parsing urls 17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr 9a6bbee800 credential: avoid writing values with newlines 17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2 1afe18a3bb l10n: es: 2.26.0 round#2 5ab9217a3c Merge branch of github.com:alshopov/git-po into master c6713676d6 Merge branch of github.com:bitigchi/git-po into master b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t) 2713dec02d l10n: tr: v2.26.0 round 2 c9ef57cc3a l10n: fr : v2.26.0 rnd 2 120b1eb731 git-rebase.txt: highlight backend differences with commit rewording 9a1b7474d6 sequencer: clear state upon dropping a become-empty commit 937d143630 i18n: unmark a message in rebase.c a56d361f66 Merge branch 'ds/sparse-add' 5fa9169ced Merge branch 'dr/push-remote-ref-update' cdef998b46 Merge branch 'jc/doc-single-h-is-for-help' 051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed) 52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master 9643441983 l10n: tr: Add glossary for Turkish translations 438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git 2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u) dd2c269652 l10n: tr: Add Turkish translations 8f4f099f8b l10n: tr: Add Turkish translation team info b4374e96c8 Git 2.26-rc1 4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch' 3658d77f8e Merge branch 'hd/show-one-mergetag-fix' 6125104b88 Merge branch 'rt/format-zero-length-fix' 1ac37deba2 Merge branch 'am/mingw-poll-fix' cf372dc815 Merge branch 'en/test-cleanup' d1075adfdf Merge branch 'en/merge-path-collision' a4fd114ffc Merge branch 'kk/complete-diff-color-moved' a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file' 0e0d717537 Merge branch 'pb/am-show-current-patch' 9b7f726dfc Merge branch 'am/pathspec-f-f-more' 4605a73073 t1091: don't grep for `strerror()` string 4d9c2902a1 l10n: fr v2.26.0 rnd1 ad182bee3f Merge branch of github.com:alshopov/git-po into master 23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1 98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t) f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed) 76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po 076cbdcd73 Git 2.26-rc0 0d65f3fb1a t5537: adjust test_oid label e63cefb024 Merge branch 'hi/gpg-use-check-signature' 5da7329e29 Merge branch 'rs/commit-graph-code-simplification' 0108fc1b46 Merge branch 'js/ci-windows-update' f3ccd9f0d9 Merge branch 'be/describe-multiroot' a6b4709302 Merge branch 'ag/rebase-remove-redundant-code' b22db265d6 Merge branch 'es/recursive-single-branch-clone' e8e71848ea Merge branch 'jk/nth-packed-object-id' a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch' 4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere' 49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix' 2cbb058669 Merge branch 'bc/wildcard-credential' 25063e2530 Merge branch 'mr/bisect-in-c-1' f4d7dfce4d Merge branch 'ds/sparse-add' 4d864895a2 t2402: test worktree path when called in .git directory af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch() 7655b4119d remote-curl: show progress for fetches over dumb HTTP 2f268890c2 The eighth batch for 2.26 aa5a7e02ad Merge branch 'ma/test-cleanup' 58595e713c Merge branch 'rs/blame-typefix-for-fingerprint' ff41848e99 Merge branch 'rs/micro-cleanups' 4cbf1a0e22 Merge branch 'es/worktree-cleanup' 46703057c1 Merge branch 'ak/test-log-graph' 777815f5f9 Merge branch 'jk/run-command-formatfix' 444cff61b4 Merge branch 'ds/partial-clone-fixes' 48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure' 8c22bd9ff9 Merge branch 'en/rebase-backend' cb2f5a8e97 Merge branch 'en/check-ignore' 0df82d99da Merge branch 'jk/object-filter-with-bitmap' 80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix' 29b09c518c Merge branch 'jk/doc-diff-parallel' 237a28173f show_one_mergetag: print non-parent in hex form. 5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context" 6d1210e133 l10n: Update Catalan translation 0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification" 7329d94be7 config.mak.dev: re-enable -Wformat-zero-length 7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings 94f4d01932 mingw: workaround for hangs when sending STDIN 1ff466c018 Documentation: clarify that `-h` alone stands for `help` 65bf820d0e t6020: new test with interleaved lexicographic ordering of directories 9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it d5bb92eced t3035: prefer test_must_fail to bash negation for git commands b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions 42d180dd01 t602[1236], t6034: modernize test formatting 802050400a merge-recursive: apply collision handling unification to recursive case 7f487ce062 Azure Pipeline: switch to the latest agent pools 5ed9fc3fc8 ci: prevent `perforce` from being quarantined eafff6e41e t/lib-httpd: avoid using macOS' sed d68ce906c7 commit-graph: use progress title directly 30b1c7ad9d describe: don't abort too early when searching tags 240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to' 2d2118b814 The seventh batch for 2.26 325eb66830 Merge branch 'es/doc-mentoring' 87f17d790d Merge branch 'es/bright-colors' d0038f4b31 Merge branch 'bw/remote-rename-update-config' 132f600b06 clone: pass --single-branch during --recurse-submodules 47319576f1 submodule--helper: use C99 named initializer ffe005576a lib-log-graph: consolidate colored graph cmp logic 989eea958b lib-log-graph: consolidate test_cmp_graph logic bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching bb4995fc3f worktree: add utility to find worktree by pathname a80c4c2214 worktree: improve find_worktree() documentation 2fecc48cad packfile: drop nth_packed_object_sha1() 6ac9760a30 packed_object_info(): use object_id internally for delta base b99b6bcc57 packed_object_info(): use object_id for returning delta base 63f4a7fc01 pack-check: push oid lookup into loop e31c71083a pack-check: convert "internal error" die to a BUG() 500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps f66d4e0250 pack-objects: use object_id struct in pack-reuse code a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id 3f83fd5e44 pack-objects: read delta base oid into object_id struct 0763671b8e nth_packed_object_oid(): use customary integer return 02bbbe9df9 worktree: drop unused code from get_main_worktree() 27f182b3fc blame: provide type of fingerprints pointer b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere df126ca142 t3400: make test clean up after itself 3c29e21eb0 t: drop debug `cat` calls cac439b56d t9810: drop debug `cat` call 91de82adc9 t4117: check for files using `test_path_is_file` 4ef346482d receive.denyCurrentBranch: respect all worktrees f8692114db t5509: use a bare repository for test push target 45f274fbb1 get_main_worktree(): allow it to be called in the Git directory fd0bc17557 completion: add diff --color-moved[-ws] 2ce6d075fa use strpbrk(3) to search for characters from a given set 2b3c430bce quote: use isalnum() to check for alphanumeric characters a51d9e8f07 t1050: replace test -f with test_path_is_file 3e96c66805 partial-clone: avoid fetching when looking for objects d0badf8797 partial-clone: demonstrate bugs in partial fetch 539052f42f run-command.h: fix mis-indented struct member 6c11c6a124 sparse-checkout: allow one-character directories in cone mode aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch e8ef1e8d6e am: convert "resume" variable to a struct bc8620b440 parse-options: convert "command mode" to a flag 62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE() 46fd7b3900 credential: allow wildcard patterns when matching config 82eb249853 credential: use the last matching username in the config 588c70e10f t0300: add tests for some additional cases 732f934408 t1300: add test for urlmatch with multiple wildcards 3fa0e04667 mailmap: add an additional email address for brian m. carlson 8a98758a8d stash push: support the --pathspec-from-file option 8c3713cede stash: eliminate crude option parsing 3f3d8068f5 doc: stash: synchronize <pathspec> description b22909144c doc: stash: document more options 0093abc286 doc: stash: split options from description (2) 2b7460d167 doc: stash: split options from description (1) 5f393dc3aa rm: support the --pathspec-from-file option fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags 73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure 6c69f22233 bisect: libify `bisect_next_all` 9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents 45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents e8e3ce6718 bisect: libify `bisect_checkout` ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents 7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()` 680e8a01e5 bisect: add enum to represent bisect returning codes bfacfce7d9 bisect--helper: introduce new `decide_next()` function b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0 292731c4c2 bisect--helper: change `retval` to `res` 16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays 7ec8125fba check-ignore: fix documentation and implementation to match 2607d39da3 doc-diff: use single-colon rule in rendering Makefile 0aa6ce3094 doc/config/push: use longer "--" line for preformatted example 20a5fd881a rev-list --count: comment on the use of count_right++ 63a58457e0 Merge branch 'py/missing-bracket' 51ebf55b93 The sixth batch for 2.26 f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints' 123538444f Merge branch 'jk/doc-credential-helper' e154451a2f Merge branch 'js/mingw-open-in-gdb' fc25a19265 Merge branch 'js/test-unc-fetch' 6365058605 Merge branch 'js/test-avoid-pipe' 966b69f02f Merge branch 'js/test-write-junit-xml-fix' d880c3de23 Merge branch 'jk/mailinfo-cleanup' 5d55554b1d Merge branch 'mr/show-config-scope' 9f3f38769d Merge branch 'rs/strbuf-insertstr' cbecc168d4 Merge branch 'rs/parse-options-concat-dup' 5af345a438 Merge branch 'bc/hash-independent-tests-part-8' 0460c109c3 Merge branch 'rs/name-rev-memsave' 6b9919c0a2 git-gui: add missing close bracket 5897e5ac96 Merge branch 'cs/german-translation' cf85a32eb6 git-gui: update German translation 5096e51c54 git-gui: extend translation glossary template with more terms 8b85bb1b70 git-gui: update pot template and German translation to current source code e68e29171c Sync with 2.25.1 c522f061d5 Git 2.25.1 10cdb9f38a rebase: rename the two primary rebase backends 2ac0d6273f rebase: change the default backend from "am" to "merge" 8295ed690b rebase: make the backend configurable via config setting 76340c8107 rebase tests: repeat some tests using the merge backend instead of am 980b482d28 rebase tests: mark tests specific to the am-backend with --am c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases 6d04ce75c4 git-prompt: change the prompt for interactive-based rebases 52eb738d6b rebase: add an --am option 8af14f0859 rebase: move incompatibility checks between backend options a bit earlier be50c938df git-rebase.txt: add more details about behavioral differences of backends befb89ce7c rebase: allow more types of rebases to fast-forward 9a70f3d4ae t3432: make these tests work with either am or merge backends 93122c985a rebase: fix handling of restrict_revision 55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer 8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling 7db00f0b3b t3406: simplify an already simple test e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty d48e5e21da rebase (interactive-backend): make --keep-empty the default e0020b2f82 prefix_path: show gitdir when arg is outside repo cc4f2eb828 doc: move credential helper info into gitcredentials(7) bfdd66e72f Sync with maint 7ae7e234c7 The fifth batch for 2.26 53c3be2c29 Merge branch 'tb/commit-graph-object-dir' 7b029ebaef Merge branch 'jk/index-pack-dupfix' aa21cc97bd Merge branch 'jk/alloc-cleanups' 883326077a Merge branch 'jh/notes-fanout-fix' f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule' 78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs' df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing' 433b8aac2e Merge branch 'ds/sparse-checkout-harden' 4a77434bc8 Merge branch 'ld/p4-cleanup-processes' 8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone' 09e48400a3 Merge branch 'jk/get-oid-error-message-i18n' 4dbeecba27 Merge branch 'ag/edit-todo-drop-check' f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2' d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout' 251187084d Merge branch 'js/rebase-i-with-colliding-hash' c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix' 56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store' 0da63da794 Merge branch 'jn/promote-proto2-to-default' a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup' daef1b300b Merge branch 'hw/advice-add-nothing' 6141e0cc00 Merge branch 'js/convert-typofix' into maint 4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint 5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint 7137d6089b Merge branch 'ms/doc-bundle-format' into maint 52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint 0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint 1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint 153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint 8857657cc9 Merge branch 'jt/t5616-robustify' into maint 1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint f468972671 Merge branch 'bc/misconception-doc' into maint 6e69042e26 Merge branch 'bc/author-committer-doc' into maint 650ed395be Merge branch 'ds/refmap-doc' into maint 80b806f1a8 Merge branch 'bc/actualmente' into maint eceff4ba12 Merge branch 'rt/submodule-i18n' into maint 8a17eb7972 Merge branch 'jk/test-fixes' into maint 54bbadaeca Merge branch 'jk/asan-build-fix' into maint 8dbeba198e Merge branch 'ds/sparse-cone' into maint e361f36f61 Merge branch 'nd/switch-and-restore' into maint 4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint 5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint 9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint 3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint 3ab3185f99 pack-objects: support filters with bitmaps 84243da129 pack-bitmap: implement BLOB_LIMIT filtering 4f3bd5606a pack-bitmap: implement BLOB_NONE filtering cc4aa28506 bitmap: add bitmap_unset() function 2aaeb9ac41 rev-list: use bitmap filters for traversal 6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure 4eb707ebd6 rev-list: allow commit-only bitmap traversals ea047a8eb4 t5310: factor out bitmap traversal comparison 608d9c9365 rev-list: allow bitmaps when counting objects 55cb10f9b5 rev-list: make --count work with --objects 792f811998 rev-list: factor out bitmap-optimized routines d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs 08809c09aa mingw: add a helper function to attach GDB to the current process bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths de26f02db1 t9001, t9116: avoid pipes a2dc43414c MyFirstContribution: rephrase contact info e03f928e2a rev-list: fallback to non-bitmap traversal when filtering acac50dd8c pack-bitmap: fix leak of haves/wants object lists 551cf8b655 pack-bitmap: factor out type iterator initialization d8437c57fa The fourth batch for 2.26 a3dcf84df0 Merge branch 'js/convert-typofix' 0de2d1409b Merge branch 'js/ci-squelch-doc-warning' 0410c2ba31 Merge branch 'jb/multi-pack-index-docfix' 0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example' e99c325bb4 Merge branch 'ms/doc-bundle-format' afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix' db72f8c940 Merge branch 'jb/parse-options-message-fix' 3d2471ba85 Merge branch 'ma/filter-branch-doc-caret' b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path' 44cba9c4b3 Merge branch 'jc/skip-prefix' 556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index' 17e4a1b141 Merge branch 'hw/doc-git-dir' 4cf7f48891 Merge branch 'jk/push-default-doc' b783391018 Merge branch 'jk/clang-sanitizer-fixes' a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache' 3f7553acf5 Merge branch 'jt/t5616-robustify' 341f8a6476 Merge branch 'jk/escaped-wildcard-dwim' b486d2ee81 Merge branch 'jn/pretend-object-doc' 076ee3e8a2 tests: fix --write-junit-xml with subshells 2b0f19fa7a convert: fix typo c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors 1751b09a92 color.c: support bright aixterm colors 4a28eb0ae4 color.c: refactor color_output arguments f696a2b1c8 mailinfo: factor out some repeated header handling ffbea1816d mailinfo: be more liberal with header whitespace f447d0293e mailinfo: simplify parsing of header values b6537d83ee mailinfo: treat header values as C strings ef07659926 sparse-checkout: work with Windows paths 2631dc879d sparse-checkout: create 'add' subcommand 4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand 6fb705abcb sparse-checkout: extract add_patterns_from_input() b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config f2a2327a4a config: provide access to the current line number 923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values ceff1a1308 remote: clean-up config callback 1a83068c26 remote: clean-up by returning early to avoid one indentation 88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types 145d59f482 config: add '--show-scope' to print the scope of a config value 9a83d088ee submodule-config: add subomdule config scope e37efa40e1 config: teach git_config_source to remember its scope 5c105a842e config: preserve scope in do_git_config_sequence 6766e41b8a config: clarify meaning of command line scoping 6dc905d974 config: split repo scope to local and worktree a5cb4204b6 config: make scope_name non-static and rename it 30183894ea ci: ignore rubygems warning in the "Documentation" job 7a9f8ca805 parse-options: simplify parse_options_dup() c84078573e parse-options: const parse_options_concat() parameters f904f9025f parse-options: factor out parse_options_count() a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat() 517b60564e mailinfo: don't insert header prefix for handle_content_type() a91cc7fad0 strbuf: add and use strbuf_insertstr() eb31044ff7 pack-format: correct multi-pack-index description 9299f84921 diff-options.txt: avoid "regex" overload in example 7378ec90e1 doc: describe Git bundle format f3037657e8 t6024: update for SHA-256 edf04243b2 t6006: make hash size independent 5db24dcffd t6000: abstract away SHA-1-specific constants d341e0805d t5703: make test work with SHA-256 88ed241a7e t5607: make hash size independent 48c10cc0e6 t5318: update for SHA-256 f7ae8e69b6 t5515: make test hash independent e70649bb66 t5321: make test hash independent a30f93b143 t5313: make test hash independent a79eec220b t5309: make test hash independent 796d1383a3 t5302: make hash size independent 417e45e5e3 t4060: make test work with SHA-256 dfa5f53e78 t4211: add test cases for SHA-256 f743e8f5b3 t4211: move SHA-1-specific test cases into a directory 72f936b120 t4013: make test hash independent 5df0f11f07 t3311: make test work with SHA-256 07877f393c t3310: make test work with SHA-256 6025e898d6 t3309: make test work with SHA-256 7b1a1822fe t3308: make test work with SHA-256 94db7e3e93 t3206: make hash size independent db12505c2c t/lib-pack: support SHA-256 303b3c1c46 submodule: add newline on invalid submodule error 887a0fd573 add: change advice config variables used by the add API de93cc14ab The third batch for 2.26 ea46d9097b Merge branch 'mt/sparse-checkout-doc-update' ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix' b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend' 7ab963e122 Merge branch 'en/fill-directory-fixes-more' f52ab33616 Merge branch 'bc/hash-independent-tests-part-7' 25794d6ce9 Merge branch 'km/submodule-add-errmsg' d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity' 76c57fedfa Merge branch 'js/add-p-leftover-bits' 9a5315edfd Merge branch 'js/patch-mode-in-others-in-c' 381e8e9de1 Merge branch 'dl/test-must-fail-fixes' 395518cf7a parse-options: lose an unnecessary space in an error message 079f970971 name-rev: sort tip names before applying 2d53975488 name-rev: release unused name strings 977dc1912b name-rev: generate name strings only if they are better 1c56fc2084 name-rev: pre-size buffer in get_parent_name() ddc42ec786 name-rev: factor out get_parent_name() f13ca7cef5 name-rev: put struct rev_name into commit slab d689d6d82f name-rev: don't _peek() in create_or_update_name() 15a4205d96 name-rev: don't leak path copy in name_ref() 36d2419c9a name-rev: respect const qualifier 71620ca86c name-rev: remove unused typedef 3e2feb0d64 name-rev: rewrite create_or_update_name() a21781011f index-pack: downgrade twice-resolved REF_DELTA to die() dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout e1c5253951 t3305: check notes fanout more carefully and robustly e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st' ad2dd5bb63 commit-graph.c: remove path normalization, comparison 13c2499249 commit-graph.h: store object directory in 'struct commit_graph' 0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context' f38c92452d t7400: testcase for submodule status on unregistered inner git repos 5290d45134 tree-walk.c: break circular dependency with unpack-trees f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode e53ffe2704 sparse-checkout: escape all glob characters on write e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand bd64de42de sparse-checkout: unquote C-style strings over --stdin d585f0e799 sparse-checkout: write escaped patterns in cone mode 4f52c2ce6c sparse-checkout: properly match escaped characters 9abc60f801 sparse-checkout: warn on globs in cone patterns 145136a95a C: use skip_prefix() to avoid hardcoded string length 04e5b3f0b4 submodule foreach: replace $path with $sm_path in example 1793280e91 t5318: don't pass non-object directory to '--object-dir' da8063522f diff: move diff.wsErrorHighlight to "basic" config b98d188581 sha1-file: allow check_object_signature() to handle any repo 2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file() 7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare() c8123e72f6 streaming: allow open_istream() to handle any repo 5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile() a651946730 cache-tree: use given repo's hash_algo at verify_one() eb999b3295 diff: make diff_populate_filespec() honor its repo argument 5b0ca878e0 Sync with maint 344ee18728 The second batch 53a83299c7 Merge branch 'bc/misconception-doc' c9ccf9d09b Merge branch 'bc/author-committer-doc' 0d0fa20c40 Merge branch 'ss/t6025-modernize' 7050624abc Merge branch 'lh/bool-to-type-bool' 4b69f29271 Merge branch 'ds/refmap-doc' aff812ce3c Merge branch 'bc/actualmente' 38fb56e92a Merge branch 'rt/submodule-i18n' f0940743fa Merge branch 'js/builtin-add-i-cmds' 0afeb3fdf4 Merge branch 'jk/test-fixes' 808dab2b58 Merge branch 'jk/asan-build-fix' fec1ff97c2 Merge branch 'sg/completion-worktree' c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function' 11ad30b887 Merge branch 'hi/gpg-mintrustlevel' 96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases' d52adee779 Merge branch 'ds/graph-horizontal-edges' 6909474491 Merge branch 'am/update-pathspec-f-f-tests' 043426c8fd Merge branch 'ds/sparse-cone' 34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig' 8dd40c0472 traverse_trees(): use stack array for name entries 667b76ec58 walker_fetch(): avoid raw array length computation 9734b74a8f normalize_path_copy(): document "dst" size expectations 43f33e492a git-p4: avoid leak of file handle when cloning 19fa5ac333 git-p4: check for access to remote host earlier 6026aff5bb git-p4: cleanup better on error exit ca5b5cce62 git-p4: create helper function importRevisions() 4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable 5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce 837b3a6376 git-p4: make closeStreams() idempotent b0418303b1 sha1-name: mark get_oid() error messages for translation 2df1aa239c fetch: forgo full connectivity check if --filter 50033772d5 connected: verify promisor-ness of partial clone d82ad54945 git: update documentation for --git-dir 0ad7144999 .mailmap: map Yi-Jyun Pan's email c56c48dd07 grep: ignore --recurse-submodules if --no-index is given 8b2a1928f0 doc: drop "explicitly given" from push.default description cf82bff73f obstack: avoid computing offsets from NULL pointer 3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer d20bc01a51 avoid computing zero offsets from NULL pointer 7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero bc3f657f71 t1506: drop space after redirection operator e5d7b2f65c t1400: avoid "test" string comparisons 5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo' 1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c c7a6207591 Sync with maint 7210ca4ee5 .mailmap: fix GGG authoship screwup 37a63faae5 t4124: only mark git command with test_must_fail a8c663cf65 t3507: use test_path_is_missing() 2def7f017c t3507: fix indentation e8a1c686ae t3504: do check for conflict marker after failed cherry-pick 1c9fd32fd2 t3419: stop losing return code of git command c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}() a781cd6fef t3415: stop losing return codes of git commands 86ce6e0dd1 t3310: extract common notes_merge_files_gone() 245b9ba0ba t3030: use test_path_is_missing() 4a6f11fd7b t2018: replace "sha" with "oid" 62e80fcb48 t2018: don't lose return code of git commands 30c0367668 t2018: teach do_checkout() to accept `!` arg 40caa5366a t2018: be more discerning when checking for expected exit codes b54128bb0b t5616: make robust to delta base change 4c616c2ba1 merge-recursive: use subtraction to flip stage ee798742bd merge-recursive: silence -Wxor-used-as-pow warning 39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin 3b2885ec9b submodule: fix status of initialized but not cloned submodules ace912bfb8 t7400: add a testcase for submodule status on empty dirs 4bb4fd4290 MyFirstContribution: add avenues for getting help 9e6d3e6417 sparse-checkout: detect short patterns 41de0c6fbc sparse-checkout: cone mode does not recognize "**" 7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone 47dbf10d8a clone: fix --sparse option with URLs 3c754067a1 sparse-checkout: create leading directories d622c34396 t1091: improve here-docs 522e641748 t1091: use check_files to reduce boilerplate 417be08d02 t1300: create custom config file without special characters 3de7ee369b t1300: fix over-indented HERE-DOCs 329e6ec397 config: fix typo in variable name 767a9c417e rebase -i: stop checking out the tip of the branch to rebase dfaed02862 fsmonitor: update documentation for hook version and watchman hooks e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2 d031049da3 completion: add support for sparse-checkout a402723e48 doc: sparse-checkout: mention --cone option 26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck b6992261de rebase -i: re-fix short SHA-1 collision d859dcad94 parse_insn_line(): improve error message when parsing failed d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects 92fb0db94c pack-objects: add checks for duplicate objects bb514de356 pack-objects: improve partial packfile reuse ff483026a9 builtin/pack-objects: introduce obj_is_packed() e704fc7978 pack-objects: introduce pack.allowPackReuse 2f4af77699 csum-file: introduce hashfile_total() 8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting() 59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile 40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains() 14fbd26044 ewah/bitmap: introduce bitmap_word_alloc() bc7a3d4dc0 The first batch post 2.25 cycle 09e393d913 Merge branch 'nd/switch-and-restore' 45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' 0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout' 36da2a8635 Merge branch 'es/unpack-trees-oob-fix' 42096c778d Merge branch 'bc/run-command-nullness-after-free-fix' 1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted' a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees' e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached' 9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting' 237a83a943 Merge branch 'dl/credential-netrc' a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir() 129510a067 t2405: clarify test descriptions and simplify test 4eaadc8493 t2405: use git -C and test_commit -C instead of subshells 773c60a45e t7410: rename to t2405-worktree-submodule.sh 7a2dc95cbc docs: mention when increasing http.postBuffer is valuable 1b13e9032f doc: dissuade users from trying to ignore tracked files 69e104d70e doc: provide guidance on user.name format 813f6025a5 docs: expand on possible and recommended user config options bc94e5862a doc: move author and committer information to git-commit(1) 7979dfe1d4 l10n: Update Catalan translation 81e3db42f3 templates: fix deprecated type option `--bool` c513a958b6 t6025: use helpers to replace test -f <path> 70789843bd t6025: modernize style 6a7aca6f01 doc: rm: synchronize <pathspec> description 856249c62a docs: use "currently" for the present time b40a50264a fetch: document and test --refmap="" a9ae8fde2e t3404: directly test the behavior of interest 22a69fda19 git-rebase.txt: update description of --allow-empty-message f1928f04b2 grep: use no. of cores as the default no. of threads 70a9fef240 grep: move driver pre-load out of critical section 1184a95ea2 grep: re-enable threads in non-worktree case 6c307626f1 grep: protect packed_git [re-]initialization c441ea4edc grep: allow submodule functions to run in parallel d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules() 1d1729caeb grep: replace grep_read_mutex by internal obj read lock 31877c9aec object-store: allow threaded access to object reading b1fc9da1c8 replace-object: make replace operations thread-safe d5b0bac528 grep: fix racy calls in grep_objects() faf123c730 grep: fix race conditions at grep_submodule() c3a5bb31c1 grep: fix race conditions on userdiff calls 0222540827 fetch: emphasize failure during submodule fetch 232378479e Sync with maint e4837b4406 t7800: don't rely on reuse_worktree_file() fbce03d329 t4018: drop "debugging" cat from hunk-header tests f65d07fffa Makefile: use compat regex with SANITIZE=address 849e43cc18 built-in add -i: accept open-ended ranges again d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files a4ffbbbb99 submodule.c: mark more strings for translation 0cbb60574e dir: point treat_leading_path() warning to the right place ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent 22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2 f365bf40a0 clean: demonstrate a bug with pathspecs b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x 277eb5af7c t5604: make hash independent 44b6c05b43 t5601: switch into repository to hash object 7a868c51c2 t5562: use $ZERO_OID 1b8f39fb0d t5540: make hash size independent a8c17e3bd6 t5537: make hash size independent 832072219c t5530: compute results based on object length 74ad99b1d8 t5512: abstract away SHA-1-specific constants ba1be1ab45 t5510: make hash size independent cba472d3ad t5504: make hash algorithm independent 82d5aeb1e6 t5324: make hash size independent 3c5e65cac1 t5319: make test work with SHA-256 235d3cddb8 t5319: change invalid offset for SHA-256 compatibility 1d86c8f0ce t5318: update for SHA-256 525a7f1769 t4300: abstract away SHA-1-specific constants 7a1bcb251b t4204: make hash size independent cb78f4f0fe t4202: abstract away SHA-1-specific constants 717c939d8f t4200: make hash size independent 08a9dd891c t4134: compute appropriate length constant 215b60bf07 t4066: compute index line in diffs 194264c185 t4054: make hash-size independent 7d5ecd775d completion: list paths and refs for 'git worktree add' 3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands 3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options 367efd54b3 completion: return the index of found word from __git_find_on_cmdline() d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function 2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper 54887b4689 gpg-interface: add minTrustLevel as a configuration option 684ceae32d fetch: default to protocol version 2 33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION 8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate b9ab170752 config doc: protocol.version is not experimental 07ef3c6604 fetch test: use more robust test for filtered objects d6509da620 fetch test: mark test of "skipping" haves as v0-only a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function bf66db37f1 add: use advise function to display hints c958d3bd0a graph: fix collapse of multiple edges 8588932e20 graph: add test to demonstrate horizontal line bug d0d0a357a1 t: directly test parse_pathspec_file() 568cabb2fe t: fix quotes tests for --pathspec-from-file f94f7bd00d t: add tests for error conditions with --pathspec-from-file b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job 12acdf573a built-in add -p: handle Escape sequences more efficiently e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode 04f816b125 built-in add -p: respect the `interactive.singlekey` config setting a5e46e6b01 terminal: add a new function to read a single keystroke 9ea416cb51 terminal: accommodate Git for Windows' default terminal 94ac3c31f7 terminal: make the code of disable_echo() reusable 08b1ea4c39 built-in add -p: handle diff.algorithm 180f48df69 built-in add -p: support interactive.diffFilter 1e4ffc765d t3701: adjust difffilter test c81638541c submodule add: show 'add --dry-run' stderr when aborting 8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token 56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token d0654dc308 Git 2.25 b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po 4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'" ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1 e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master 1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' d78a1968c5 Merge branch 'ma/config-advice-markup-fix' a20ae3ee29 l10n: Update Catalan translation 49e268e23e mingw: safeguard better against backslashes in file names 4c6c7971e0 unpack-trees: correctly compute result count 63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1 75449c1b39 l10n: de.po: Reword generation numbers 6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t) 3901d2c6bd config/advice.txt: fix description list separator 7a6a90c6ec Git 2.25-rc2 1f5f3ffe5c Merge branch 'ds/graph-assert-fix' a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix' 202f68b252 Merge branch 'pm/am-in-body-header-doc-update' 7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix' c5dc20638b Merge branch 'do/gitweb-typofix-in-comments' fe47c9cb5f Merge https://github.com/prati0100/git-gui a1087c9367 graph: fix lack of color in horizontal lines 0d251c3291 graph: drop assert() for merge with two collapsing parents 4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper 573117dfa5 unpack-trees: watch for out-of-range index position e701bab3e9 restore: invalidate cache-tree when removing entries with --staged 1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command fa74180d08 checkout: don't revert file on ambiguous tracking branches 2957709bd4 parse_branchname_arg(): extract part as new function 5020f6806a t2018: improve style of if-statement 7ffb54618b t2018: add space between function name and () 63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH 065027ee1a string-list: note in docs that callers can specify sorting function 26f924d50e unpack-trees: exit check_updates() early if updates are not wanted 042ed3e048 The final batch before -rc2 0f1930cd1b Merge branch 'ds/sparse-cone' 037f067587 Merge branch 'ds/commit-graph-set-size-mult' f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify' c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode' a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' c4117fcb97 Merge branch 'pb/clarify-line-log-doc' 556f0258df Merge branch 'ew/packfile-syscall-optim' 5814d44d9b doc: submodule: fix typo for command absorbgitdirs 7047f75f22 editorconfig: indent text files with tabs 60440d72db sha1-file: document how to use pretend_object_file 7fdc5f296f l10n: es: 2.25.0 round #1 f8740c586b am: document that Date: can appear as an in-body header 4e2c4c0d4f gitweb: fix a couple spelling errors in comments 421c0ffb02 multi-pack-index: correct configuration in documentation 757ff352bd Documentation/git-sparse-checkout.txt: fix a typo 0d2116c644 Merge branch 'zs/open-current-file' 9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u) 3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master 4c5081614c l10n: fr.po v2.25.0 rnd 1 5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0 63020f175f commit-graph: prefer default size_mult when given zero 224c7d70fa mingw: only test index entries for backslashes, not tree entries 9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED 8679ef24ed Git 2.25-rc1 a82027e9e6 Merge branch 'js/use-test-tool-on-path' 13432fc6dd Merge branch 'js/mingw-reserved-filenames' e0e1ac5db0 Merge branch 'en/rebase-signoff-fix' b76a244c9d Merge branch 'em/freebsd-cirrus-ci' bc855232bc Merge branch 'bk/p4-misc-usability' 763a59e71c merge-recursive: remove unnecessary oid_eq function 44143583b7 sparse-checkout: use extern for global variables d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master 13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1 786f4d2405 git-gui: allow opening currently selected file in default app 4fd683b6a3 sparse-checkout: document interactions with submodules de11951b03 sparse-checkout: list directories in cone mode 0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0 578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed) 173fff68da Merge tag 'v2.25.0-rc0' into git-po-master f1842ff531 t2018: remove trailing space from test description 20a67e8ce9 t3008: find test-tool through path lookup 9e341f62ca l10n: Update Catalan translation 4e61b2214d packfile: replace lseek+read with pread ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision 2be45868a8 doc: log, gitk: document accepted line-log diff formats 280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD 0a76bd7381 mailmap: mask accentless variant for Công Danh 99c33bed56 Git 2.25-rc0 d2189a721c Merge branch 'en/fill-directory-fixes' 8be0a428d6 Merge branch 'rs/test-cleanup' 65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string' c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context' 45b96a6fa1 Merge branch 'js/add-p-in-c' ccc292e862 Merge branch 'jc/drop-gen-hdrs' dfee504bee Merge branch 'ja/doc-markup-cleanup' 87cbb1ca66 Merge branch 'rs/ref-read-cleanup' 20aa6d88b7 Merge branch 'rb/p4-lfs' fcd5b55f56 Merge branch 'pb/submodule-doc-xref' 4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free' ba6b66281e Merge branch 'ln/userdiff-elixir' bd72a08d6c Merge branch 'ds/sparse-cone' f3c520e17f Merge branch 'sg/name-rev-wo-recursion' 6514ad40a1 Merge branch 'ra/t5150-depends-on-perl' 17066bea38 Merge branch 'dl/format-patch-notes-config-fixup' 135365dd99 Merge branch 'am/pathspec-f-f-checkout' ff0cb70d45 Merge branch 'am/pathspec-from-file' 4dc42c6c18 mingw: refuse paths containing reserved names 98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16 c480eeb574 commit --interactive: make it work with the built-in `add -i` cee6cb7300 built-in add -p: implement the "worktree" patch modes 52628f94fc built-in add -p: implement the "checkout" patch modes 6610e4628a built-in stash: use the built-in `git add -p` if so configured 90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting 36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes d2a233cb8b built-in add -p: prepare for patch modes other than "stage" 761e3d26bb sparse-checkout: improve OS ls compatibility 6579d93a97 contrib/credential/netrc: work outside a repo 1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI b441717256 t1507: inline full_name() 9291e6329e t1507: run commands within test_expect_success 5236fce6b4 t1507: stop losing return codes of git commands 10812c2337 t1501: remove use of `test_might_fail cp` 62d58cda69 t1409: use test_path_is_missing() b87b02cfe6 t1409: let sed open its own input file 9b92070e52 t1307: reorder `nongit test_must_fail` 3595d10c26 t1306: convert `test_might_fail rm` to `rm -f` f511bc02ed t0020: use ! check_packed_refs_marked f6041abdcd t0020: don't use `test_must_fail has_cr` f46c243e66 t0003: don't use `test_must_fail attr_check` 99c049bc4c t0003: use test_must_be_empty() 3738439c77 t0003: use named parameters in attr_check() 7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err() b8afb908c2 t/lib-git-p4: use test_path_is_missing() 4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases 6836d2fe06 dir.c: use st_add3() for allocation size c847dfafee dir: consolidate similar code in treat_directory() 777b420347 dir: synchronize treat_leading_path() and read_directory_recursive() b9670c1f5e dir: fix checks on common prefix directory 5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit 23cbe427c4 Merge branch 'py/console-close-esc' 124a895811 t4015: improve coverage of function context test 509efef789 commit: forbid --pathspec-from-file --all 12029dc57d t3434: mark successful test as such e0f9095aaa notes.h: fix typos in comment 675ef6bab8 t6030: don't create unused file 01ed17dc8c t5580: don't create unused file f670adb49b t3501: don't create unused file 1e1ccbfdd3 git-gui: allow closing console window with Escape 7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays. b02fd2acca The sixth batch 59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex' e3b72391d1 Merge branch 'rs/commit-export-env-simplify' 43bf44e23a Merge branch 'rs/archive-zip-code-cleanup' 4438a1a59f Merge branch 'js/t3404-indent-fix' 3a44db2ed2 Merge branch 'dr/branch-usage-casefix' 8bc481f4f6 Merge branch 'sg/t9300-robustify' 011fc2e88e Merge branch 'js/add-i-a-bit-more-tests' d1c0fe8d9b Merge branch 'dl/range-diff-with-notes' 26c816a67d Merge branch 'hw/doc-in-header' f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context' 71a7de7a99 Merge branch 'dl/rebase-with-autobase' c9f5fc9114 Merge branch 'dl/test-cleanup' 6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap' 3beff388b2 Merge branch 'js/builtin-add-i-cmds' 4755a34c47 Merge branch 'dd/time-reentrancy' 37c2619d91 Merge branch 'ag/sequencer-todo-updates' 608e380502 git-p4: show detailed help when parsing options fail e2aed5fd5b git-p4: yes/no prompts should sanitize user text 571fb96573 fix-typo: consecutive-word duplications f371984613 Makefile: drop GEN_HDRS 2e4083198d built-in add -p: show helpful hint when nothing can be staged 54d9d9b2ee built-in add -p: only show the applicable parts of the help text ade246efed built-in add -p: implement the 'q' ("quit") command d6cf873340 built-in add -p: implement the '/' ("search regex") command 9254bdfb4f built-in add -p: implement the 'g' ("goto") command bcdd297b78 built-in add -p: implement hunk editing b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf" 11f2c0dae8 built-in add -p: coalesce hunks after splitting them 510aeca199 built-in add -p: implement the hunk splitting feature 0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions 5906d5de77 built-in app -p: allow selecting a mode change as a "hunk" 47dc4fd5eb built-in add -p: handle deleted empty files 80399aec5a built-in add -p: support multi-file diffs 7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed 12c24cf850 built-in add -p: color the prompt and the help text 25ea47af49 built-in add -p: adjust hunk headers as needed e3bd11b4eb built-in add -p: show colored hunks by default 1942ee44e8 built-in add -i: wire up the new C code for the `patch` command f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C d1b1384d61 userdiff: remove empty subexpression from elixir regex df5be01669 doc: indent multi-line items in list fd5041e127 doc: remove non pure ASCII characters 190a65f9db sparse-checkout: respect core.ignoreCase in cone mode 1d7297513d notes: break set_display_notes() into smaller functions 66f79ee23d config/format.txt: clarify behavior of multiple format.notes cc2bd5c45d gitmodules: link to gitsubmodules guide 99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed 8c02fe6060 t7004: don't create unused file cb05d6a5ed t4256: don't create unused file c5c4eddd56 dir: break part of read_directory_recursive() out for reuse 072a231016 dir: exit before wildcard fall-through if there is no wildcard 2f5d3847d4 dir: remove stray quote character in comment a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories" 452efd11fb t3011: demonstrate directory traversal failures ea94b16fb8 git-p4: honor lfs.storage configuration variable 51a0a4ed95 bisect--helper: avoid use-after-free d32e065a91 Merge branch 'kk/branch-name-encoding' ad05a3d8e5 The fifth batch 7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix' b089e5e6cb Merge branch 'em/test-skip-regex-illseq' 930078ba39 Merge branch 'hi/gpg-use-check-signature' 08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode' 7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk' 55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm' 41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress' 5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise' dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix' d37cfe3b5c Merge branch 'dl/pretty-reference' 99c4ff1bda Merge branch 'dl/submodule-set-url' 55d607d85b Merge branch 'js/mingw-inherit-only-std-handles' c58ae96fc4 Merge branch 'am/pathspec-from-file' 7c88714262 Merge branch 'po/bundle-doc-clonable' 5d9324e0f4 Merge branch 'ra/rebase-i-more-options' 7034cd094b Sync with Git 2.24.1 09ac67a183 format-patch: move git_config() before repo_init_revisions() 8164c961e1 format-patch: use --notes behavior for format.notes 452538c358 notes: extract logic into set_display_notes() e6e230eeae notes: create init_display_notes() helper 1e6ed5441a notes: rename to load_display_notes() 2866fd284c name-rev: cleanup name_ref() 49f7a2fde9 name-rev: eliminate recursion in name_rev() fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name' e05e8cf074 archive-zip: use enum for compression method 39acfa3d22 git gui: fix branch name encoding error 11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description 8cf8f9b4aa t3404: fix indentation 4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs 147ee35558 commit: use strbuf_add() to add a length-limited string 559c6fc317 The fourth batch 56e6c16394 Merge branch 'dl/lore-is-the-archive' 3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive' 7cb0d37f6d Merge branch 'tg/perf-remove-stale-result' 403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick' f0cf2fee5d Merge branch 'hi/grep-do-not-return-void' 391fb22ac7 Merge branch 'rs/use-skip-prefix-more' 92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd' 4ba74ca901 Merge branch 'rs/test-cleanup' f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick' ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9' 8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters 3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances dd432a6ecf name-rev: restructure parsing commits and applying date cutoff dd090a8a37 name-rev: pull out deref handling from the recursion 766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev() bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation e0c4da6f2a name-rev: avoid unnecessary cast in name_ref() c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name() c593a26348 t6120-describe: modernize the 'check_describe' helper abcf857300 range-diff: clear `other_arg` at end of function f8675343d7 range-diff: mark pointers as const 828765dfe0 t3206: fix incorrect test name 0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early 21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile b4bbbbd5a2 apply --allow-overlap: fix a corner case 89c8559367 git add -p: use non-zero exit code when the diff generation failed e91162be9c t3701: verify that the diff.algorithm config setting is handled 0c3222c4f3 t3701: verify the shown messages when nothing can be added 24be352d52 t3701: add a test for the different `add -p` prompts 8539b46534 t3701: avoid depending on the TTY prerequisite 0f0fba2cc8 t3701: add a test for advanced split-hunk editing 53a06cf39b Git 2.24.1 67af91c47a Sync with 2.23.1 a7312d1a28 Git 2.23.1 7fd9fd94fb Sync with 2.22.2 d9589d4051 Git 2.22.2 5421ddd8d0 Sync with 2.21.1 367f12b7e9 Git 2.21.1 20c71bcf67 Merge branch 'fix-msys2-quoting-bugs' 7d8b676992 mingw: sh arguments need quoting in more circumstances d9061ed9da t7415: drop v2.20.x-specific work-around 04522edbd4 mingw: fix quoting of empty arguments for `sh` 49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly fc346cb292 Sync with 2.20.2 4cd1cf31ef Git 2.20.2 c154745074 submodule: defend against submodule.update = !command in .gitmodules 4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x d851d94151 Sync with 2.19.3 caccc527ca Git 2.19.3 7c9fbda6e2 Sync with 2.18.2 9877106b01 Git 2.18.2 14af7ed5a9 Sync with 2.17.3 a5ab8d0317 Git 2.17.3 bb92255ebe fsck: reject submodule.update = !command in .gitmodules bdfef0492c Sync with 2.16.6 eb288bc455 Git 2.16.6 68440496c7 test-drop-caches: use `has_dos_drive_prefix()` 9ac92fed5b Sync with 2.15.4 7cdafcaacf Git 2.15.4 e904deb89d submodule: reject submodule.update = !command in .gitmodules d3ac8c3f27 Sync with 2.14.6 66d2a6159f Git 2.14.6 083378cc35 The third batch 88bd37a2d0 Merge branch 'js/pkt-line-h-typofix' 473b431410 Merge branch 'us/unpack-trees-fsmonitor' e0f9ec9027 Merge branch 'sg/test-bool-env' fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset' e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere' 88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory' 8feb47e882 Merge branch 'dl/t5520-cleanup' 6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree' 57d46bc602 Merge branch 'mg/doc-submodule-status-cached' 75bd003c7b Merge branch 'js/git-svn-use-rebase-merges' f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix' c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits' 36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree' cf91c31688 Merge branch 'sg/unpack-progress-throughput' ef6104581d Merge branch 'pb/submodule-update-fetches' 7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix' f3c7bfdde2 Merge branch 'dl/range-diff-with-notes' 9502b616f1 Merge branch 'jh/userdiff-python-async' 76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2' 995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label' f7998d9793 Merge branch 'js/builtin-add-i' 917d0d6234 Merge branch 'js/rebase-r-safer-label' 56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers' 2763530048 Merge branch 'jg/revert-untracked' fa38ab68b0 git-gui: revert untracked files by deleting them d9c6469f38 git-gui: update status bar to track operations 29a9366052 git-gui: consolidate naming conventions 0bb313a552 xdiff: unignore changes in function context 2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names' 65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods' 5532ebdeb7 Merge branch 'fix-mingw-quoting-bug' 76a681ce9c Merge branch 'dubiously-nested-submodules' dd53ea7220 Merge branch 'turn-on-protectntfs-by-default' f82a97eb91 mingw: handle `subst`-ed "DOS drives" 7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams' d2c84dad1c mingw: refuse to access paths with trailing spaces or periods 379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh 817ddd64c2 mingw: refuse to access paths with illegal characters cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors 7530a6287e quote-stress-test: allow skipping some trials 35edce2056 t6130/t9350: prepare for stringent Win32 path validation 55953c77c0 quote-stress-test: accept arguments to test via the command-line ad15592529 tests: add a helper to stress test argument quoting a8dee3ca61 Disallow dubiously-nested submodule git directories 9102f958ee protect_ntfs: turn on NTFS protection by default 91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams 6d8684161e mingw: fix quoting of arguments 3a85dc7d53 is_ntfs_dotgit(): speed it up 7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses 288a74bcd2 is_ntfs_dotgit(): only verify the leading segment a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark cae0bc09ab rebase: fix format.useAutoBase breakage 945dc55dda format-patch: teach --no-base 700e006c5d t4014: use test_config() a749d01e1d format-patch: fix indentation 0c47e06176 t3400: demonstrate failure with format.useAutoBase d9b31db2c4 t7700: stop losing return codes of git commands 3699d69df0 t7700: make references to SHA-1 generic dcf9a748ca t7700: replace egrep with grep cfe5eda02a t7700: consolidate code into test_has_duplicate_object() ae475afc0f t7700: consolidate code into test_no_missing_in_packs() 14b7664df8 doc: replace LKML link with lore.kernel.org d23f9c8e04 RelNotes: replace Gmane with real Message-IDs dcee037228 doc: replace MARC links with lore.kernel.org a9aecc7abb checkout, restore: support the --pathspec-from-file option cfd9376c1d doc: restore: synchronize <pathspec> description 8ea1189eac doc: checkout: synchronize <pathspec> description 6fdc9ad259 doc: checkout: fix broken text reference 1d022bb43f doc: checkout: remove duplicate synopsis bebb5d6d6b add: support the --pathspec-from-file option 21bb3083c3 cmd_add: prepare for next patch 4778452597 Merge branch 'prevent-name-squatting-on-windows' a7b1ad3b05 Merge branch 'jk/fast-import-unsafe' 525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()` e1d911dd4c mingw: disallow backslash characters in tree objects' file names 0060fd1511 clone --recurse-submodules: prevent name squatting on Windows a52ed76142 fast-import: disallow "feature import-marks" by default 68061e3470 fast-import: disallow "feature export-marks" by default 019683025f fast-import: delay creating leading directories for export-marks e075dba372 fast-import: stop creating leading directories for import-marks 11e934d56e fast-import: tighten parsing of boolean command line options 816f806786 t9300: create marks files for double-import-marks test f94804c1f2 t9300: drop some useless uses of cat 4f3e57ef13 submodule--helper: advise on fatal alternate error 10c64a0b3c Doc: explain submodule.alternateErrorStrategy ec48540fe8 packfile.c: speed up loading lots of packfiles 3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value a4fb016ba1 pkt-line: fix a typo 0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data 228f53135a The second batch 6c630f237e Merge branch 'jk/gitweb-anti-xss' 3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell' 4775e02a5c Merge branch 'ma/t7004' a6c6f8d02a Merge branch 'js/complete-svn-recursive' 3ae8defaf9 Merge branch 'jk/send-pack-remote-failure' aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix' 4ab9616c76 Merge branch 'sg/skip-skipped-prereq' 723a8adba5 Merge branch 'ds/test-read-graph' 9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation' 406ca29e0d Merge branch 'rs/parse-options-dup-null-fix' fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging' 8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion' ef8f621045 Merge branch 'dl/complete-rebase-onto' 3c3e5d0ea2 Merge branch 'tg/stash-refresh-index' 43c5fe1c1d Merge branch 'nn/doc-rebase-merges' 6511cb33c9 Merge branch 'dd/sequencer-utf8' f165457618 Merge branch 'jk/remove-sha1-to-hex' a774064fb0 Merge branch 'dj/typofix-merge-strat' ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates' d2489ce92c Merge branch 'rs/skip-iprefix' 376e7309e1 Merge branch 'ln/userdiff-elixir' 9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log' d3096d2ba6 Merge branch 'en/doc-typofix' 26f20fa3fc Merge branch 'ns/test-desc-typofix' ffd130a363 Merge branch 'en/t6024-style' 5149902ff9 Merge branch 'en/misc-doc-fixes' bcb06e204c Merge branch 'js/fetch-multi-lockfix' d08daec001 Merge branch 'rs/trace2-dots' fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix' bad5ed39cd Merge branch 'cb/curl-use-xmalloc' 7ab2088255 Merge branch 'rt/fetch-message-fix' f089ddd56a Merge branch 'es/myfirstcontrib-updates' 3c90710c0c Merge branch 'hw/config-doc-in-header' d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code' 5444d52866 Merge branch 'js/vreportf-wo-buffering' 05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add' ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides' 532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default' dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists' fac9ab1419 Merge branch 'ma/bisect-doc-sample-update' a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix' 0be5caf97c Merge branch 'jc/log-graph-simplify' 0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck' 2e697ced9d built-in add -i: offer the `quit` command d7633578b5 built-in add -i: re-implement the `diff` command 8746e07277 built-in add -i: implement the `patch` command ab1e1cccaf built-in add -i: re-implement `add-untracked` in C c54ef5e424 built-in add -i: re-implement `revert` in C a8c45be939 built-in add -i: implement the `update` command f37c226454 built-in add -i: prepare for multi-selection commands c08171d156 built-in add -i: allow filtering the modified files list 0c3944a628 add-interactive: make sure to release `rev.prune_data` 4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance 867fc7f310 grep: don't return an expression from pcre2_free() c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables 72b006f4bf gpg-interface: prefer check_signature() for GPG verification 7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r ccd469450a date.c: switch to reentrant {gm,local}time_r 271c351b2f t7811: don't create unused file 65efb42862 t9300: don't create unused file f6b9413baf sequencer: fix a memory leak in sequencer_continue() 3eae30e464 doc: replace public-inbox links with lore.kernel.org 46c67492aa doc: recommend lore.kernel.org over public-inbox.org 5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects 17a4ae92ea t7700: s/test -f/test_path_is_file/ d2eee32a89 t7700: move keywords onto their own line 7a1c8c2346 t7700: remove spaces after redirect operators 09279086e8 t7700: drop redirections to /dev/null 756ee7fc9f t7501: stop losing return codes of git commands 38c1aa01de t7501: remove spaces after redirect operators 763b47bafa t5703: stop losing return codes of git commands eacaa1c180 t5703: simplify one-time-sed generation logic a29b2429e5 t5317: use ! grep to check for no matching lines 6c37f3ec1b t5317: stop losing return codes of git commands b66e0a1773 t4138: stop losing return codes of git commands afd43c9905 t4015: use test_write_lines() 946d2353a3 t4015: stop losing return codes of git commands 50cd31c652 t3600: comment on inducing SIGPIPE in `git rm` 3b737381d8 t3600: stop losing return codes of git commands 0d913dfa7e t3600: use test_line_count() where possible 29a40b5a67 t3301: stop losing return codes of git commands 9b5a9fa60a t0090: stop losing return codes of git commands 17aa9d9c1a t0014: remove git command upstream of pipe 77a946be98 apply-one-time-sed.sh: modernize style 176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job ed254710ee test: use test_must_be_empty F instead of test_cmp empty F c74b3cbb83 t7812: add missing redirects 213dabf49d test: use test_must_be_empty F instead of test -z $(cat F) c93a5aaec8 t1400: use test_must_be_empty 6e4826ea75 t1410: use test_line_count a5d04a3ef9 t1512: use test_line_count 54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd() 2059e79c0d name-rev: use skip_prefix() instead of starts_with() 1768aaf01d push: use skip_prefix() instead of starts_with() ec6ee0c07a shell: use skip_prefix() instead of starts_with() 7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with() a6293f5d28 fetch: use skip_prefix() instead of starts_with() 13ca8fb79e t5150: skip request-pull test if Perl is disabled ecc0869080 commit-graph: use start_delayed_progress() 44a4693bfc progress: create GIT_PROGRESS_DELAY 528d9e6d01 t/perf: don't depend on Git.pm b8dcc45387 perf-lib: use a single filename for all measurement types fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk' d82dfa7f5b rebase -i: finishing touches to --reset-author-date 1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory 393adf7a6f sequencer: directly call pick_commits() from complete_action() a2dd67f105 rebase: fill `squash_onto' in get_replay_opts() 3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function 34065541e3 sequencer: update `done_nr' when skipping commands in a todo list 8638114e06 sequencer: update `total_nr' when adding an item to a todo list 0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions 9917eca794 l10n: zh_TW: add translation for v2.24.0 0a8e3036a3 reset: parse rev as tree-ish in patch mode f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits 8d483c8408 doc: document 'git submodule status --cached' befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later 9a780a384d mingw: spawned processes need to inherit only standard handles c5a03b1e29 mingw: work around incorrect standard handles eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool 43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values 2d05ef2778 sequencer: fix empty commit check when amending ea8b7be147 git svn: stop using `rebase --preserve-merges` 67a6ea6300 gpg-interface: limit search for primary key fingerprint 392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern cff4e9138d sparse-checkout: check for dirty status 416adc8711 sparse-checkout: update working directory in-process for 'init' f75a69f880 sparse-checkout: cone mode should not interact with .gitignore fb10ca5b54 sparse-checkout: write using lockfile 99dfa6f970 sparse-checkout: use in-process update for disable subcommand e091228e17 sparse-checkout: update working directory in-process e9de487aa3 sparse-checkout: sanitize for nested folders 4dcd4def3c unpack-trees: add progress to clear_ce_flags() eb42feca97 unpack-trees: hash less in cone mode af09ce24a9 sparse-checkout: init and set in cone mode 96cc8ab531 sparse-checkout: use hashmaps for cone patterns 879321eb0b sparse-checkout: add 'cone' mode e6152e35ff trace2: add region in clear_ce_flags 72918c1ad9 sparse-checkout: create 'disable' subcommand 7bffca95ea sparse-checkout: add '--stdin' option to set subcommand f6039a9423 sparse-checkout: 'set' subcommand d89f09c828 clone: add --sparse mode bab3c35908 sparse-checkout: create 'init' subcommand 94c0956b60 sparse-checkout: create builtin with 'list' subcommand 679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files df6d3d6802 lib-bash.sh: move `then` onto its own line 2a02262078 t5520: replace `! git` with `test_must_fail git` c245e58bb6 t5520: remove redundant lines in test cases a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp e959a18ee7 t5520: don't put git in upstream of pipe 5540ed27bc t5520: test single-line files by git with test_cmp dd0f1e767b t5520: use test_cmp_rev where possible 979f8891cc t5520: replace test -{n,z} with test-lib functions 3037d3db90 t5520: use test_line_count where possible 93a9bf876b t5520: remove spaces after redirect operator ceeef863de t5520: replace test -f with test-lib functions 4c8b046f82 t5520: let sed open its own input 53c62b9810 t5520: use sq for test case names e8d1eaf9b4 t5520: improve test style 2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals 8cb7980382 t0000: test multiple local assignment 5b583e6a09 format-patch: pass notes configuration to range-diff bd36191886 range-diff: pass through --notes to `git log` 9f726e1b87 range-diff: output `## Notes ##` header 3bdbdfb7a5 t3206: range-diff compares logs with commit notes 75c5aa0701 t3206: s/expected/expect/ 79f3950d02 t3206: disable parameter substitution in heredoc 3a6e48e9f7 t3206: remove spaces after redirect operators 26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish 077a1fda82 userdiff: support Python async functions 3798149a74 SubmittingPatches: use `--pretty=reference` 1f0fc1db85 pretty: implement 'reference' format 618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type 0df621172d pretty: provide short date format ac52d9410e t4205: cover `git log --reflog -z` blindspot 3e8ed3b93e pretty.c: inline initalize format_context 4982516451 revision: make get_revision_mark() return const pointer f0f9de2bd7 completion: complete `tformat:` pretty format fb2ffa77a6 SubmittingPatches: remove dq from commit reference bae74c9dfb pretty-formats.txt: use generic terms for hash bd00717eab SubmittingPatches: use generic terms for hash 9d45ac4cbf rev-list-options.txt: remove reference to --show-notes 828e829b9e argv-array: add space after `while` e440fc5888 commit: support the --pathspec-from-file option 66a25a7242 doc: commit: synchronize <pathspec> description 64bac8df97 reset: support the `--pathspec-from-file` option d137b50756 doc: reset: synchronize <pathspec> description 24e4750c96 pathspec: add new function to parse file 0dbc4a0edf ci(osx): update homebrew-cask repository with less noise e02058a729 sequencer: handle rebase-merges for "onto" message bae60ba7e9 builtin/unpack-objects.c: show throughput progress 2d92ab32fd rev-parse: make --show-toplevel without a worktree an error 9e5afdf997 fetch: add trace2 instrumentation 4c4066d95d run-command: move doc to run-command.h 6c51cb525d trace2: move doc to trace2.h 7db0305438 parse-options: add link to doc file in parse-options.h d95a77d059 submodule-config: move doc to submodule-config.h f3b9055624 credential: move doc to credential.h bbcfa3002a tree-walk: move doc to tree-walk.h 971b1f24a2 argv-array: move doc to argv-array.h f1ecbe0f53 trace: move doc to trace.h 13aa9c8b70 cache: move doc to cache.h c0be43f898 sigchain: move doc to sigchain.h 19ef3ddd36 pathspec: move doc to pathspec.h 301d595e72 revision: move doc to revision.h 3a1b3415d9 attr: move doc to attr.h 126c1ccefb refs: move doc to refs.h d27eb356bf remote: move doc to remote.h and refspec.h 405c6b1fbc sha1-array: move doc to sha1-array.h d3d7172e40 merge: move doc to ll-merge.h 3f1480b745 graph: move doc to graph.h and graph.c 266f03eccd dir: move doc to dir.h 13c4d7eb22 diff: move doc to diff.h and diffcore.h cd5522271f rebase -r: let `label` generate safer labels 867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()` 8c15904462 built-in add -i: implement the `help` command 3d965c7674 built-in add -i: use color in the main loop 68db1cbf8e built-in add -i: support `?` (prompt help) 76b743234c built-in add -i: show unique prefixes of the commands 6348bfba58 built-in add -i: implement the main loop a376e37b2c gitweb: escape URLs generated by href() b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI f28bceca75 t/gitweb-lib.sh: drop confusing quotes 0eba60c9b7 t9502: pass along all arguments in xss helper 932757b0cc INSTALL: use existing shell scripts as example b018719927 t7004: check existence of correct tag 1daaebcaa5 built-in add -i: color the header in the `status` command 5e82b9e4d2 built-in add -i: implement the `status` command e4cb659ebd diff: export diffstat interface f83dff60a7 Start to implement a built-in version of `git add --interactive` df53c80822 stash: make sure we have a valid index before writing it ad7a403268 send-pack: check remote ref status on pack-objects failure d91ce887c9 t6120-describe: correct test repo history graph in comment 1f9247a3bd completion: tab-complete "git svn --recursive" 603960b50e promisor-remote: remove fetch_if_missing=0 e362fadcd0 clone: remove fetch_if_missing=0 169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL 51bd6be32d mingw: use COPY_ARRAY for copying array 4bd0593e0f test-tool: use 'read-graph' helper e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway d784d978f6 t4215: use helper function to check output 61eea521fe fsmonitor: do not compare bitmap size with size of split index b19f3fe9dd hex: drop sha1_to_hex() c1ce9c06d0 completion: learn to complete `git rebase --onto=` f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase aa6d7f93ed hex: drop sha1_to_hex_r() 52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch 5772b0c745 sequencer: reencode old merge-commit message e0eba649e8 bundle-verify: add --quiet 79862b6b77 bundle-create: progress output control 73c3253d75 bundle: framework for options before bundle file 68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in" b375744274 sequencer: reencode squashing commit's message 019a9d8362 sequencer: reencode revert/cherry-pick's todo list 0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding 1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary d9f6f3b619 The first batch post 2.24 cycle 28014c1084 Merge branch 'bc/hash-independent-tests-part-6' 57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree' c22f63c40f Merge branch 'pb/pretty-email-without-domain-part' 5731ca3657 Merge branch 'hw/remove-api-docs-placeholder' 14b58c62bc Merge branch 'sg/commit-graph-usage-fix' eff313f8a7 Merge branch 'dl/apply-3way-diff3' db806d7064 Merge branch 'sg/dir-trie-fixes' f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix' 8f1119b988 Merge branch 'wb/midx-progress' d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes' 0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges' 8f40d89783 Merge branch 'hv/bitshift-constants-in-blame' d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head' 5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer' b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc' 15d9f3dc66 Merge branch 'es/walken-tutorial' 026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor' ed28358833 convert: use skip_iprefix() in validate_encoding() 89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding() 03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules ae821ffe83 multimail: fix a few simple spelling errors 557c5895c2 sha1dc: fix trivial comment spelling error aa74be316a Fix spelling errors in test commands 96c0caf5e3 Fix spelling errors in messages shown to users 4dc8b1c114 Fix spelling errors in names of tests 7a40cf1553 Fix spelling errors in comments of testcases 15beaaa3d1 Fix spelling errors in code comments a807200f67 userdiff: add Elixir to supported userdiff languages 461caf3e8a git-shortlog.txt: include commit limiting options 6462d5eb9a fetch: remove fetch_if_missing=0 46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion 99b2ba35f5 t0028: eliminate non-standard usage of printf add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul` 14c4776d75 t: fix typo in test descriptions 270de6acbe t6024: modernize style 77363a51fb name-hash.c: remove duplicate word in comment c92faa4d22 hashmap: fix documentation misuses of -> versus . a6d39f2efb git-filter-branch.txt: correct argument name typo 4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators 8915297925 Fix spelling errors in documentation outside of Documentation/ 031fd4b93b Documentation: fix a bunch of typos, both old and new dd0b61f577 fsmonitor: fix watchman integration 5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare() 7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph c14e6e7903 fetch: add the command-line option `--write-commit-graph` da72936f54 Git 2.24 1d34d425d4 Merge branch 'bc/doc-use-docbook-5' dac1d83c91 Merge branch 'ds/commit-graph-on-fetch' c32ca691c2 Merge branch 'jt/delay-fetch-if-missing' ab6b50e4c8 Merge https://github.com/prati0100/git-gui 93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2 fe28ad8520 rebase: add --reset-author-date 08187b4cba rebase -i: support --ignore-date 0185c683c9 sequencer: rename amend_author to author_to_rename cbd8db17ac rebase -i: support --committer-date-is-author-date c068bcc59b sequencer: allow callers of read_author_script() to ignore fields ba51d2fb24 rebase -i: add --ignore-whitespace flag 3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower 3ada78de3f myfirstcontrib: add dependency installation step 4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt 4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly 8dfb04ae96 update-index: optionally leave skip-worktree entries alone 116d1fa6c6 vreportf(): avoid relying on stdio buffering efd5444238 RelNotes/2.24.0: fix self-contradictory note 391c7e40b5 fetch.c: fix typo in a warning message 55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template 849e43680d RelNotes/2.24.0: typofix 0115e5d929 git-diff.txt: document return code of `--no-index` 798d66e35d l10n: de.po: Update German translation c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u) f21f8f5d35 Git 2.24-rc2 8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix' 0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix' f2db52c46b Merge branch 'js/mingw-needs-hiding-fix' 5b7594abdc Merge branch 'master' of github.com:vnwildman/git 034d33653a Merge branch 'next' of github.com:ChrisADR/git-po 26b061007c submodule: teach set-url subcommand 460782b7be t7519-status-fsmonitor: improve comments d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses 4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config 1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694) f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0 762d5b4f46 help: add gitsubmodules to the list of guides 76a53d640f git_path(): handle `.lock` files correctly 3ce47211a6 t1400: wrap setup code in test case 44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string 6c02042139 clone: rename static function `dir_exists()`. 8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command 77200e9332 l10n: es: 2.24.0 round 2 e42df36b42 Merge branch 'l10n/it/update-italian-translation' 5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2 51728480fe l10n: fr v2.24.0 rnd2 045a548698 l10n: git.pot: v2.24.0 round 2 (1 new) 468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree() c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit() 103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag() f648ee7088 fsck: rename vague "oid" local variables cc579000bf fsck: don't require an object struct in verify_headers() 7854399366 fsck: don't require an object struct for fsck_ident() b8b00f1693 fsck: drop blob struct from fsck_finish() 6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob() 38370253fd fsck: don't require an object struct for report() f59793763d fsck: only require an oid for skiplist functions 5afc4b1dc6 fsck: only provide oid/type in fsck_error callback 82ef89b318 fsck: don't require object structs for display functions 733902905d fsck: use oids rather than objects for object_name API d40bbc109b fsck_describe_object(): build on our get_object_name() primitive a59cfb3230 fsck: unify object-name code 23a173a761 fsck: require an actual buffer for non-blobs 2175a0c601 fsck: stop checking tag->tagged ec65231571 fsck: stop checking commit->parent counts 1de6007d85 fsck: stop checking commit->tree value 228c78fbd4 commit, tag: don't set parsed bit for parse failures 60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()` 8b656572ca builtin/commit-graph.c: remove subcommand-less usage string fa26d5ede6 t4048: abstract away SHA-1-specific constants cf02be8486 t4045: make hash-size independent 38ee26b2a3 t4044: update test to work with SHA-256 37ab8ebef1 t4039: abstract away SHA-1-specific constants 0370b35414 t4038: abstract away SHA-1 specific constants 0253e126a2 t4034: abstract away SHA-1-specific constants 45e2ef2b1d t4027: make hash-size independent 79b0edc1a0 t4015: abstract away SHA-1-specific constants 840624ff55 t4011: abstract away SHA-1-specific constants 32a6707267 t4010: abstract away SHA-1-specific constants 440bf91dfa t3429: remove SHA1 annotation 0b408ca2bd t1305: avoid comparing extensions 2eabd38313 rev-parse: add a --show-object-format option 52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode 45e206f0d8 t4203: use test-lib.sh definitions 2ae4944aac t6006: use test-lib.sh definitions cb99a34e23 commit-graph: fix writing first commit-graph during fetch e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug 7b4fb434b4 documentation: remove empty doc files 566a1439f6 Git 2.24-rc1 04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix' 4d6fb2beeb Merge branch 'ds/feature-macros' 5f0b6ed907 Merge branch 'js/azure-ci-osx-fix' c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs' 1b4f85285f Merge branch 'dl/submodule-set-branch' c7aadccba0 fetch: delay fetch_if_missing=0 until after config c11e9966cb repo-settings: read an int for index.version 091489d068 apply: respect merge.conflictStyle in --3way aa76ae4905 t4108: demonstrate bug in apply 95806205cd t4108: use `test_config` instead of `git config` b0069684d4 t4108: remove git command upstream of pipe fa87b81385 t4108: replace create_file with test_write_lines 7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job 6c96630cb0 config: move documentation to config.h d81542e6f3 Eleventh batch e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix' d45d771978 Merge branch 'bc/smart-http-atomic-push' 22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix' 2e215b7959 Merge branch 'sb/userdiff-dts' e3cf08361a Merge branch 'sg/progress-fix' b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix' c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc' f45f88b2e4 path.c: don't call the match function without value in trie_find() c72fc40d09 path.c: clarify two field names in 'struct common_dir' 8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file 7cb8c929d7 path.c: clarify trie_find()'s in-code comment e536b1fedf Documentation: mention more worktree-specific exceptions 680cba2c2b multi-pack-index: add [--[no-]progress] option. 64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file 8dc18f8937 midx: add progress to expire_midx_packs 840cef0c70 midx: add progress to write_midx_file efbc3aee08 midx: add MIDX_PROGRESS flag 0eb3671ed9 ci(osx): use new location of the `perforce` cask da1e295e00 t604[236]: do not run setup in separate tests 49b8133a9e merge-recursive: fix merging a subdirectory into the root directory d3eebaad5e merge-recursive: clean up get_renamed_dir_portion() 80736d7c5e doc: am --show-current-patch gives an entire e-mail message a8e2c0eadc t7419: change test_must_fail to ! for grep 19c29e538e t4014: make output-directory tests self-contained 12a4aeaad8 Merge branch 'js/azure-pipelines-msvc' 399c23c046 ci(visual-studio): actually run the tests in parallel 711cd6d15c ci(visual-studio): use strict compile flags, and optimization 370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0 cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master 907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master 13bcea8c7f l10n: fr 2.24.0 rnd 1 135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master 3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed) 8da56a4848 userdiff: fix some corner cases in dts regex 86795774bb builtin/blame.c: constants into bit shift format feebd2d256 rebase: hide --preserve-merges option 0e40a73a4c Doc: Bundle file usage 78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error 12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error 2b6f6ea1bd test-progress: fix test failures on big-endian systems f757409e36 l10n: bg.po: Updated Bulgarian translation (4693) 176f5adfdb completion: clarify installation instruction for zsh d966095db0 Git 2.24-rc0 90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array' 3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth' d0258d0944 Merge branch 'rs/http-push-simplify' bb52def6da Merge branch 'jj/stash-reset-only-toplevel' f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs' e5fca6b573 Merge branch 'bb/compat-util-comment-fix' 43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup' 07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely' 2d74d28ee0 Merge branch 'dl/compat-cleanup' 9b83a94829 Merge branch 'ta/t1308-typofix' 376012c919 Merge branch 'js/doc-stash-save' 10da030ab7 grep: avoid leak of chartables in PCRE2 513f2b0bbd grep: make PCRE2 aware of custom allocator 57d4660468 grep: make PCRE1 aware of custom allocator d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand 8af69cf3e2 t3301: test diagnose messages for too few/many paramters 6f1194246a remote-curl: pass on atomic capability to remote side bbb13e8188 graph: fix coloring of octopus dashes 92beecc136 graph: flatten edges that fuse with their right neighbor 479db18bc0 graph: smooth appearance of collapsing edges on commit lines 0195285b95 graph: rename `new_mapping` to `old_mapping` d62893ecc1 graph: commit and post-merge lines for left-skewed merges 0f0f389f12 graph: tidy up display of left-skewed merges 458152cce1 graph: example of graph output that can be simplified ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state 46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()` a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()` 9157a2a032 graph: reuse `find_new_column_by_commit()` 210179a20d graph: handle line padding in `graph_next_line()` fbccf255f9 graph: automatically track display width of graph lines 5374a290aa fetch-pack: write fetched refs to .promisor 4627bc777e sequencer: run post-commit hook 49697cb721 move run_commit_hook() to libgit and use it there 12bb7a540a sequencer.h fix placement of #endif 6a619ca03c t3404: remove uneeded calls to set_fake_editor b2dbacbddf t3404: set $EDITOR in subshell 88a92b6c73 t3404: remove unnecessary subshell bf8e65b30b format-patch: teach --cover-from-description option a92331df18 format-patch: use enum variables 46273df7bf format-patch: replace erroneous and condition 3b3c79f6c9 diff-highlight: fix a whitespace nit 108b97dc37 Ninth batch cbe8cdd3a0 Merge branch 'jk/coc' 3b9ec27919 Merge branch 'js/trace2-fetch-push' c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch' 1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup' eb3de5b823 Merge branch 'js/xdiffi-comment-updates' 4e8371ec26 Merge branch 'dl/t0000-skip-test-test' b6d712fa4e Merge branch 'tg/range-diff-output-update' 77458870a5 Merge branch 'gs/sq-quote-buf-pretty' 5efabc7ed9 Merge branch 'ew/hashmap' d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files' 6ed610b968 Merge branch 'am/t0028-utf16-tests' 5b900fb812 Merge branch 'dl/octopus-graph-bug' 16d9d7184b Merge branch 'en/fast-imexport-nested-tags' 6d5291be45 Merge branch 'js/azure-pipelines-msvc' ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd' d96e31e390 Merge branch 'js/fetch-jobs' 280bd44551 Merge branch 'en/merge-recursive-cleanup' 062a309d36 remote-curl: use argv_array in parse_push() a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes 5cc6a4be11 http-push: simplify deleting a list item 556895d0c8 stash: avoid recursive hard reset on submodules b524f6b399 Merge branch 'ka/japanese-translation' f6f3824b4e git-gui: improve Japanese translation 61f4b407d3 Merge branch 'py/readme' 1e6880fd06 git-gui: add a readme edefc31873 format-patch: create leading components of output directory 68b69211b2 git-compat-util: fix documentation syntax fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth() e0479fa073 documentation: add tutorial for object walking 3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed 4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target 9cad1c4488 pthread.h: manually align parameter lists 8c1cfd58e3 t1308-config-set: fix a test that has a typo 57d8f4b4c7 doc(stash): clarify the description of `save` 08da6496b6 Eighth batch 07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup' f0d407e6ae Merge branch 'kt/add-i-progress' 66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree' a4c5d9f66e Merge branch 'rs/dedup-includes' 159cdabd87 Merge branch 'js/range-diff-noprefix' 93424f1f7d Merge branch 'cb/pcre1-cleanup' a73f91774c Merge branch 'ab/pcre-jit-fixes' 4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword' 020011f2cb Merge branch 'tk/git-svn-trim-author-name' 676278f8ea Merge branch 'bc/object-id-part17' aafb75452b Merge branch 'en/clean-nested-with-ignored' 3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails 5cdf2301d4 add a Code of Conduct document 70bf0b755a Seventh batch 9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat' 2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary' d17f54947d Merge branch 'rs/convert-fix-utf-without-dash' 82c80f98e6 Merge branch 'py/git-gui-has-maintainer' 6e12570822 Merge branch 'ah/cleanups' 772cad0afb Merge branch 'js/diff-rename-force-stable-sort' 424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path' 678a9ca629 Merge branch 'as/shallow-slab-use-fix' 0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix' 042a54d251 Merge branch 'am/visual-studio-config-fix' 03d3b1297c xdiffi: fix typos and touch up comments b05b40930e t0000: cover GIT_SKIP_TESTS blindspots d8bc1a518a send-pack: never fetch when checking exclusions 756fb0dedb t4014: treat rev-list output as the expected value 2b6a9b13ca range-diff: don't segfault with mode-only changes 360c7ba330 transport: push codepath can take arbitrary repository ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments b657047719 merge-recursive: fix the fix to the diff3 common ancestor label b744c3af07 Sixth batch 417056578a Merge branch 'bw/submodule-helper-usage-fix' 9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check' 1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a' 59b19bcd9f Merge branch 'cc/multi-promisor' 1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way' 5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort' eb35c18e42 Merge branch 'sg/travis-help-debug' cabb145fe3 Merge branch 'rs/alias-use-copy-array' 56c7ab0f4e Merge branch 'sg/t-helper-gitignore' e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang' 583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules' 337e3f2b49 Merge branch 'rs/nth-switch-code-simplification' 8f53fe1733 Merge branch 'hb/hg-to-git-py3' ef93bfbd45 Merge branch 'sg/progress-fix' 980351d1ac Merge branch 'js/doc-patch-text' 80693e3f09 Merge branch 'tb/commit-graph-harden' ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge' 3f84633563 Merge branch 'dl/cocci-everywhere' caf150ce7d Merge branch 'gs/commit-graph-progress' 1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim' 1398171378 Merge branch 'rs/commit-graph-use-list-count' 773521df26 Merge branch 'rs/nth-parent-parse' 7f17913161 Merge branch 'dl/submodule-set-branch' cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix' bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees' 098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack' 37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc' e392382f95 Merge branch 'dl/complete-rebase-and-archive' cda8faa37e Merge branch 'jk/commit-graph-cleanup' 36d2fca82b Merge branch 'ss/get-time-cleanup' ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude' ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob' ba2d451122 Merge branch 'tg/stash-refresh-index' e2b5038d87 hashmap_entry: remove first member requirement from docs 404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry 23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators c8e424c9c9 hashmap: introduce hashmap_free_entries 8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry * 87571c3f71 hashmap: use *_entry APIs for iteration 939af16eac hashmap_cmp_fn takes hashmap_entry params f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *" f0e63c4113 hashmap: use *_entry APIs to wrap container_of 6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *" 973d5eea74 introduce container_of macro 26b455f21e hashmap_put takes "struct hashmap_entry *" 28ee794128 hashmap_remove takes "const struct hashmap_entry *" b6c5241606 hashmap_get takes "const struct hashmap_entry *" b94e5c1df6 hashmap_add takes "struct hashmap_entry *" f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *" d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *" d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry 12878c8351 coccicheck: detect hashmap_entry.hash assignment e010a41216 diff: use hashmap_entry_init on moved_entry.ent f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo" de5abb5f7a git-p4: auto-delete named temporary file c90b652afd Fifth batch f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1' b0f8aed48f Merge branch 'ma/user-manual-markup-update' faf5576a8d Merge branch 'bc/doc-use-docbook-5' 314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes' 70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo' 847650798b Merge branch 'am/mailmap-andrey-mazo' 1a155f2e66 Merge branch 'jc/git-gui-has-maintainer' 1bcef51204 t/oid-info: add empty tree and empty blob values ecde49bb8a t/oid-info: allow looking up hash algorithm name 11a3d3aadd git-rev-list.txt: prune options in synopsis 7d2f003ee4 Documentation: update the location of the git-gui repo b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding() 46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines b35304bf95 ci: really use shallow clones on Azure Pipelines ab7d854aba tests: let --immediate and --write-junit-xml play well together be5d88e112 test-tool run-command: learn to run (parts of) the testsuite 5d65ad17a9 vcxproj: include more generated files 030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built 61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable() e4347c9434 msvc: handle DEVELOPER=1 ed712ef8d5 msvc: ignore some libraries when linking 5b8f9e2417 compat/win32/path-utils.h: add #include guards 41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning c097b95a26 msvc: avoid using minus operator on unsigned types dfd557c978 stash apply: report status correctly even in a worktree's subdirectory d54dea77db fetch: let --jobs=<n> parallelize --multiple, too 87db61a436 trace2: write discard message to sentinel files 83e57b04e6 trace2: discard new traces if target directory has too many files 11c21f22de t4214: demonstrate octopus graph coloring failure 25eb905e14 t4214: explicitly list tags in log 63be8c8dd7 t4214: generate expect in their own test cases a7a5590c6e t4214: use test_merge 94ba151300 test-lib: let test_merge() perform octopus merges 22541013d0 docs: clarify trace2 version invariants 3d4548e7e2 docs: mention trace2 target-dir mode in git-config 2fe44394c8 treewide: remove duplicate #include directives dbcd970c27 push: do not pretend to return `int` from `die_push_simple()` 941790d7de fast-export: handle nested tags 8d7d33c1ce t9350: add tests for tags of things other than a commit a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags 208d69246e fast-export: add support for --import-marks-if-exists b8f50e5b60 fast-import: add support for new 'alias' command f73b2aba05 fast-import: allow tags to be identified by mark labels 3164e6bd24 fast-import: fix handling of deleted tags 8085050ab4 add -i: show progress counter in the prompt 69fdb922ad Merge branch 'bw/diff3-conflict-style' b436825b9b git-gui: support for diff3 conflict style 937b76ed49 range-diff: internally force `diff.noprefix=true` 411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job 25e4b8099c push: add trace2 instrumentation 5fc31180d8 fetch: add trace2 instrumentation 53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value c3b57dc2a0 git-gui: use existing interface to query a path's attribute 45ab460d4a Merge branch 'js/git-bash-if-available' 0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command 71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only) 54a80a9ad8 wrapper: use a loop instead of repetitive statements baed6bbb5b diffcore-break: use a goto instead of a redundant if statement 8da02ce62a commit-graph: remove a duplicate assignment ddb3c856f3 shallow.c: don't free unallocated slabs 8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits 65904b8b2b promisor-remote: skip move_to_tail when no-op 2049b8dc65 diffcore_rename(): use a stable sort 97fff61012 Move git_sort(), a stable sort, into into libgit.a 69f272b922 dir: special case check for the possibility that pathspec is NULL 6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available bc12974a89 Fourth batch 5a5350940b Merge branch 'ds/commit-graph-on-fetch' 974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch' 9755f70fe6 Merge branch 'ds/include-exclude' 93fc8760e7 Merge branch 'jh/trace2-pretty-output' 640f9cd599 Merge branch 'dl/rebase-i-keep-base' 026428c35e Merge branch 'sg/clean-nested-repo-with-ignored' 21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip' d693345518 Merge branch 'dl/use-sq-from-test-lib' d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes' 2be6ccc01a Merge branch 'sg/git-test-boolean' cf861cd7a0 Merge branch 'rs/get-tagged-oid' 91243b019d Merge branch 'en/filter-branch-deprecation' 9bc67b6658 Merge branch 'en/merge-options-ff-and-friends' fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden' cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option' 8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return' 3ff6af7753 Merge branch 'nd/switch-and-restore' aadac067aa Merge branch 'tb/file-url-to-unc-path' b57a88a5f1 Merge branch 'js/gitdir-at-unc-root' 6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path' 430439536b Merge branch 'rs/parse-tree-indirect' 991fd97b9a Merge branch 'jk/fast-import-history-bugfix' 74a39b9bcc Merge branch 'mh/notes-duplicate-entries' 37801f0665 Merge branch 'tb/banned-vsprintf-namefix' 21ce0b48f3 Merge branch 'mh/release-commit-memory-fix' f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup' bf6136cab8 Merge branch 'rs/strbuf-detach' a2e22bb3ad Merge branch 'rs/trace2-dst-warning' 1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup' 0281733483 Merge branch 'bc/hash-independent-tests-part-5' f06fb376ed Merge branch 'jc/test-cleanup' 00bb74453d Merge branch 'dl/compat-cleanup' 59438be06c Merge branch 'js/visual-studio' cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone' af2abd870b fast-export: fix exporting a tag and nothing else c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit fd5b820d9c user-manual.txt: change header notation e79b34533a user-manual.txt: add missing section label b503a2d515 Makefile: emulate compile in $(HCO) target better af26e2a9d2 pack-bitmap.h: remove magic number b06fdead04 promisor-remote.h: include missing header 97b989ee3a apply.h: include missing header 4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name d928a8388a t0028: add more tests 0b63fd6965 t0028: fix test for UTF-16-LE-BOM fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration 2e09c01232 name-rev: avoid cutoff timestamp underflow 8464f94aeb promisor-remote.h: drop extern from function declaration 75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp 24c681794f doc: MyFirstContribution: fix cmd placement instructions c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode 60c60b627e Merge branch 'py/git-git-extra-stuff' faf420e05a treewide: correct several "up-to-date" to "up to date" b71c6c3b64 Fix build with core.autocrlf=true 16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff 26e3d1cbea .mailmap: update email address of Andrey Mazo 27ea41c0b4 t/helper: ignore only executable files 7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias() 83e3ad3b12 merge-recursive: symlink's descendants not in way 34933d0eff stash: make sure to write refreshed cache e080b34540 merge: use refresh_and_write_cache 22184497a3 factor out refresh_and_write_cache function 7371612255 commit-graph: add --[no-]progress to write and verify 47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW 253bfe49bd SubmittingPatches: git-gui has a new maintainer d17ae00c97 hg-to-git: make it compatible with both python3 and python2 4c86140027 Third batch f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http' 627b826834 Merge branch 'md/list-objects-filter-combo' b9ac6c59b8 Merge branch 'cc/multi-promisor' de67293e74 Merge branch 'sg/line-log-tree-diff-optim' 95486229e3 Merge branch 'sg/complete-configuration-variables' f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook' a2e524ecf3 Merge branch 'cb/curl-use-xmalloc' 128666753b Merge branch 'jk/drop-release-pack-memory' 917a319ea5 Merge branch 'js/rebase-r-strategy' 7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui 4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout() 0d4304c124 doc: fix reference to --ignore-submodules af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py 8a3a6817e2 Merge gitk to pick up emergency build fix 2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po 9027af58e2 Makefile: run coccicheck on more source files 43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES) 5dedf7de53 Makefile: define THIRD_PARTY_SOURCES 902b90cf42 clean: fix theoretical path corruption ca8b5390db clean: rewrap overly long line 09487f2cba clean: avoid removing untracked files in a nested git repository e86bbcf987 clean: disambiguate the definition of -d 3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run 29b577b960 dir: add commentary explaining match_pathspec_item's return value 89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case 404ebceda0 dir: also check directories for matching pathspecs a5e916c745 dir: fix off-by-one error in match_pathspec_item bbbb6b0b89 dir: fix typo in comment 7541cc5302 t7300: add testcases showing failure to clean specified pathspecs 0eb7c37a8a diff, log doc: small grammer, format, and language fixes 6fae6bd518 diff, log doc: say "patch text" instead of "patches" 2bb74b53a4 Test the progress display bbf47568ad Revert "progress: use term_clear_line()" cf6a2d2557 Makefile: strip leading ./ in $(LIB_H) b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup 689a146c91 commit-graph: use commit_list_count() 59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N" a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N" a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base" cf34337f98 list-objects-filter: give a more specific error sparse parsing error 4c96a77594 list-objects-filter: delay parsing of sparse oid 72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter 83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer 7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>` 226daba280 Doc/Makefile: give mansource/-version/-manual attributes 40e747e89d git-submodule.txt: fix AsciiDoc formatting error f6461b82b9 Documentation: fix build with Asciidoctor 2 3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk f7a8834ba4 Merge branch 'bp/amend-toggle-bind' ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit" 9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog beffae768a gitk: Add Chinese (zh_CN) translation 56d9cbe68b packfile: expose get_delta_base() bab28d9f97 builtin/pack-objects: report reused packfile objects 6c8ec8c30a Merge branch 'bw/commit-scrollbuffer' acfa495519 Merge branch 'bw/amend-checkbutton' da08d559b7 git-gui: add horizontal scrollbar to commit buffer ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton aeeb978ba6 completion: teach archive to use __gitcomp_builtin 2b9bd488ae completion: teach rebase to use __gitcomp_builtin d49dffde9a completion: add missing completions for log, diff, show 6abada1880 upload-pack: disable commit graph more gently for shallow traversal fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time 72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set 4fd39c76e6 doc: minor formatting fix 29f4332e66 Quit passing 'now' to date code c77abf0460 Merge branch 'py/revert-hunks-lines' 5a2bb62180 Merge branch 'bp/widget-focus-hotkeys' e07446ed5f git-gui: add hotkeys to set widget focus f981ec18cf cache-tree: do not lazy-fetch tentative tree f1d4a28250 Second batch c8ada15456 Merge branch 'bc/reread-attributes-during-rebase' 8f3ba423e7 Merge branch 'tg/t0021-racefix' a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email' d49c2c3466 Merge branch 'sb/userdiff-dts' 2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe' 4c49dd042d Merge branch 'nd/diff-parseopt' d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix' 8ce8a63b46 Merge branch 'ds/midx-expire-repack' 9437394661 Merge branch 'cb/fetch-set-upstream' af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix' fa9e7934c7 Merge branch 'bm/repository-layout-typofix' d1a251a1fa Merge branch 'en/checkout-mismerge-fix' e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental' f4f8dfe127 Merge branch 'ds/feature-macros' 4a12f89865 Merge branch 'jk/eoo' b4a1eec332 Merge branch 'jk/repo-init-cleanup' 70336bd50a Merge branch 'py/git-gui-do-quit' ad7c543e3b grep: skip UTF8 checks explicitly 0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration() b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration 4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor b7e1ba5649 git-merge-index.txt: wrap shell listing in "----" 38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----" 5371813768 git-ls-remote.txt: wrap shell listing in "----" 1925fe0c8a Documentation: wrap config listings in "----" 922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor 2017956a19 Documentation: wrap blocks with "--" dd2e50a84e commit-graph: turn off save_commit_buffer 67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits 806278dead commit-graph.c: handle corrupt/missing trees 16749b8dd2 commit-graph.c: handle commit parsing errors 23424ea759 t/t5318: introduce failing 'git commit-graph write' tests bf1e28e0ad builtin/rebase.c: Remove pointless message d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing bd482d6e33 t: use common $SQ variable 3a37876b5d pack-objects: drop packlist index_pos optimization 7e6b96c73b test-read-cache: drop namelen variable e4b369069e diff-delta: set size out-parameter to 0 for NULL delta 7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint f1cbd033e2 pack-objects: use object_id in packlist_alloc() 0dfed92dfd git-am: handle missing "author" when parsing commit 3960290675 ci: restore running httpd tests 6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests c77722b3ea use get_tagged_oid() dad3f0607b tag: factor out get_tagged_oid() 468ce99b77 unpack-trees: rename 'is_excluded_from_list()' 65edd96aec treewide: rename 'exclude' methods to 'pattern' 4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_' caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list' ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern' 483e861111 t9902: use a non-deprecated command for testing 9df53c5de6 Recommend git-filter-repo instead of git-filter-branch 7b6ad97939 t6006: simplify, fix, and optimize empty message test 50094ca45f config/format.txt: specify default value of format.coverLetter c1a6f21cd4 Doc: add more detail for git-format-patch 854b5cb46a t4014: stop losing return codes of git commands dd2b6b6860 t4014: remove confusing pipe in check_threading() 6bd26f58ea t4014: use test_line_count() where possible c6ec6dadba t4014: let sed open its own files f2e2fa8f60 t4014: drop redirections to /dev/null 460609cbd5 t4014: use indentable here-docs 92014b69bb t4014: remove spaces after redirect operators 0ab74e979c t4014: use sq for test case names cb46c40662 t4014: move closing sq onto its own line b562a54c01 t4014: s/expected/expect/ e770fbfeff t3005: remove unused variable da280f5f1a t: use LF variable defined in the test harness 7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch 552fc5016f mingw: apply array.cocci rule 476998d05b t3427: accelerate this test by using fast-export and fast-import aac6ff7b5b .gitignore: stop ignoring `.manifest` files 2c65d90f75 am: reload .gitattributes after patching it 1577dc0f7c tree: simplify parse_tree_indirect() 50f26bd035 fetch: add fetch.writeCommitGraph config setting 8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set 27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options 0a8bc7068f clarify documentation for remote helpers 80e3658647 help: make help_unknown_ref() NORETURN 313677627a checkout: add simple check for 'git checkout -b' 3441de5b9c gitk: Make web links clickable a4fa2f0a4c git-gui: allow undoing last revert 414d924beb rebase: teach rebase --keep-base 6330209d7d rebase tests: test linear branch topology 4effc5bc96 rebase: fast-forward --fork-point in more cases c0efb4c1dd rebase: fast-forward --onto in more cases 2b318aa6c3 rebase: refactor can_fast_forward into goto tower c9efc21683 t3432: test for --no-ff's interaction with fast-forward 1ebec8dfc1 fast-import: duplicate into history rather than passing ownership 9756082b3c fast-import: duplicate parsed encoding string 86ae43da6a status: mention --skip for revert and cherry-pick b1b16bba96 completion: add --skip for cherry-pick and revert deaa65a754 completion: merge options for cherry-pick and revert 4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests 793ac7e309 t3432: test rebase fast-forward behavior 359ecebc34 t3431: add rebase --fork-point tests 502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage ff61681b46 grep: refactor and simplify PCRE1 support 8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1 1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning() fd99c2dd9b grep: use return value of strbuf_detach() 82f51af345 log-tree: always use return value of strbuf_detach() 7e92756751 http: don't leak urlmatch_config.vars 9784f97321 commit: free the right buffer in release_commit_memory ce17feb1b3 path: add a function to check for path suffix 60d198d022 banned.h: fix vsprintf()'s ban message 60fe477a0b notes: avoid potential use-after-free during insertion 779ad6641b notes: avoid leaking duplicate entries 4e1a641ee3 mingw: fix launching of externals from Unicode paths 5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly e2683d51d9 Fix .git/ discovery at the root of UNC shares d17f2124a7 setup_git_directory(): handle UNC paths correctly ebb8d2c90f mingw: support UNC in git clone file://server/share/repo 0c37c41d13 t4009: make hash size independent c1f3dfcc23 t4002: make hash independent 8cc5ff83c3 t4000: make hash size independent c784815073 t3903: abstract away SHA-1-specific constants 2ccdfb1c78 git-gui: return early when patch fails to apply 62bd99934b git-gui: allow reverting selected hunk 5f0a516de9 git-gui: allow reverting selected lines fddf2ebe38 transport: teach all vtables to allow fetch first ac3fda82bf transport-helper: skip ls-refs if unnecessary 745f681289 First batch after Git 2.23 d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg' 22e86e85cb Merge branch 'en/fast-import-merge-doc' 9c7573581c Merge branch 'jk/perf-no-dups' 4336fdb2ef Merge branch 'rs/nedalloc-fixlets' 8ae7a46c4d Merge branch 'sg/show-failed-test-names' 6ba06b582b Merge branch 'sg/commit-graph-validate' 072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix' 207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix' 77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests' 1b01cdbf2e Merge branch 'jk/tree-walk-overflow' 8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix' 307179732d Merge branch 'mt/grep-submodules-working-tree' 58166c2e9d t0021: make sure clean filter runs 8b3f33ef11 ref-filter: initialize empty name or email fields 3c81760bc6 userdiff: add a builtin pattern for dts files fe49814409 t4014: drop unnecessary blank lines from test cases a2bb801f6a line-log: avoid unnecessary full tree diffs eef5204190 line-log: extract pathspec parsing from line ranges into a helper function a63694f523 diff: skip GITLINK when lazy fetching missing objs 7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe 19800bdc3f parseopt: move definition of enum parse_opt_result up 415b770b88 packfile.h: drop extern from function declaration acb49d1cc8 t3800: make hash-size independent ca6ba94200 t3600: make hash size independent 19ce5496c2 t3506: make hash independent 9a6738c061 t3430: avoid hard-coded object IDs 4dd1b5f90f t3404: abstract away SHA-1-specific constants b99bfc7a6c t3306: abstract away SHA-1-specific constants e3e9d02e35 t3305: make hash size independent b408cf8cf6 t3301: abstract away SHA-1-specific constants b561edd213 t3206: abstract away hash size constants a5f61c7d13 t3201: abstract away SHA-1-specific constants 1c24a54ea4 repository-layout.txt: correct pluralization of 'object' b0a3186140 sequencer: simplify root commit creation a47ba3c777 rebase -i: check for updated todo after squash and reword 450efe2d53 rebase -i: always update HEAD before rewording c581e4a749 grep: under --debug, show whether PCRE JIT is enabled aaa95dfa05 midx: switch to using the_hash_algo be8e172e9f builtin/show-index: replace sha1_to_hex 3f34d70d40 rerere: replace sha1_to_hex fc06be3b7f builtin/receive-pack: replace sha1_to_hex 69fa337060 builtin/index-pack: replace sha1_to_hex 3a4d7aa5ae packfile: replace sha1_to_hex e0cb7cdb89 wt-status: convert struct wt_status to object_id 8d4d86b0f0 cache: remove null_sha1 f6ca67d673 builtin/worktree: switch null_sha1 to null_oid dd336a5511 builtin/repack: write object IDs of the proper length 894c0f66bb pack-write: use hash_to_hex when writing checksums 4439c7a360 sequencer: convert to use the_hash_algo 95518faac1 bisect: switch to using the_hash_algo e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo fe9fec45f6 config: use the_hash_algo in abbrev comparison 976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo 703d2d4193 bundle: switch to use the_hash_algo 9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo 7962e046ff show-index: switch hard-coded constants to the_hash_algo fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ 7e0d029f18 builtin/rev-parse: switch to use the_hash_algo 319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo f6af19a9ad fetch-pack: use parse_oid_hex 36261e42ec patch-id: convert to use the_hash_algo 28ba1830d0 builtin/replace: make hash size independent 24bc1a1292 pull, fetch: add --set-upstream option 71d41ff651 archive-tar: turn length miscalculation warning into BUG 17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header() 82a46af13e archive-tar: fix pax extended header length calculation 4060c1990a archive-tar: report wrong pax extended header length 4615a8cb5b merge-recursive: alphabetize include list 45ef16f77a merge-recursive: add sanity checks for relevant merge_options f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* 5bf7e5779e merge-recursive: split internal fields into a separate struct e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output a779fb829b merge-recursive: comment and reorder the merge_options fields 8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options 7c0a6c8e47 merge-recursive: move some definitions around to clean up the header c749ab1da8 merge-recursive: rename merge_options argument to opt in header bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list 4d7101e25c merge-recursive: fix some overly long lines 724dd767b2 cache-tree: share code between functions writing an index as a tree 345480d1ed merge-recursive: don't force external callers to do our logging b4db8a2b76 merge-recursive: remove useless parameter in merge_trees() 98a1d3d888 merge-recursive: exit early if index != head 9822175d2b Ensure index matches head before invoking merge machinery, round N 10f751c06b merge-recursive: remove another implicit dependency on the_repository f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks 8e01251694 merge-recursive: introduce an enum for detect_directory_renames values 743474cbfa merge-recursive: provide a better label for diff3 common ancestor 51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u) 5bace62582 l10n: Update Catalan translation 139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees() 65c01c6442 checkout: provide better conflict hunk description with detached HEAD d8523ca1b9 merge-recursive: be consistent with assert acb7da05ac checkout: remove duplicate code 93b980e58f http: use xmalloc with cURL 64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental aaf633c2ad repo-settings: create feature.experimental setting c6cc4c5afd repo-settings: create feature.manyFiles setting ad0fb65999 repo-settings: parse core.untrackedCache 31b1de6a09 commit-graph: turn on commit-graph by default b068d9a250 t6501: use 'git gc' in quiet mode 7211b9e753 repo-settings: consolidate some config settings 507e5470a0 worktree remove: clarify error message on dirty worktree 5af9d5f6c8 completion: complete config variables and values for 'git clone --config=' 88cd790d6a completion: complete config variables names and values for 'git clone -c' dd33472831 completion: complete values of configuration variables after 'git -c var=' e1e00089da completion: complete configuration sections and variable names for 'git -c' 42d0efec59 completion: split _git_config() d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp() 2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names d9438873c4 completion: deduplicate configuration sections 7a09a8f093 completion: add tests for 'git config' completion 840d7e5b3c completion: complete more values of more 'color.*' configuration variables 08a12175d8 completion: fix a typo in a comment 9827d4c185 packfile: drop release_pack_memory() d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed 362f8b280c t/perf: rename duplicate-numbered test script 742ed63345 trace2: cleanup whitespace in perf format e34430556c trace2: cleanup whitespace in normal format c2b890aca5 quote: add sq_append_quote_argv_pretty() ad43e37839 trace2: trim trailing whitespace in normal format error message 04f10d332f trace2: remove dead code in maybe_add_string_va() da4589ce7e trace2: trim whitespace in region messages in perf target format 0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit 5440eb0ea2 git-gui: call do_quit before destroying the main window bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook 6098817fd7 git-merge: honor pre-merge-commit hook a1f3dd7eb3 merge: do no-verify like commit f78f6c7e0c t7503: verify proper hook execution 70597e8386 nedmalloc: avoid compiler warning about unused value c9b9c09dae nedmalloc: do assignments only after the declaration section 22932d9169 config: stop checking whether the_repository is NULL 5732f2b1ef common-main: delay trace2 initialization 58ebccb478 t1309: use short branch name in includeIf.onbranch test 67feca3b1c gitcli: document --end-of-options 51b4594b40 parse-options: allow --end-of-options as a synonym for "--" 19e8789b23 revision: allow --end-of-options to end option parsing ffe1afe67c tests: show the test name and number at the start of verbose output 96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests 7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits' 39d8831856 commit-graph: turn a group of write-related macro flags into an enum 9916073be5 t5318-commit-graph: use 'test_expect_code' 620c09e1b6 restore: add test for deleted ita files ecd72042de checkout.c: unstage empty deleted ita files a613d4f817 pack-refs: always refresh after taking the lock file decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd' 371df1bea9 trace2: cleanup column alignment in perf target format 5aa02f9868 tree-walk: harden make_traverse_path() length computations c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path() b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len() 37806080d7 tree-walk: use size_t consistently 7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh' 12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh' 9055384710 tree-walk: drop oid from traverse_info 947208b725 setup_traverse_info(): stop copying oid e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto` a63f990d92 t3418: test `rebase -r` with merge strategies 5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges` e145d99347 rebase -r: support merge strategies other than `recursive` 4e6023b13a t3427: fix another incorrect assumption f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced a9c71073da t3427: fix erroneous assumption b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case c248d32cdb t3427: simplify the `setup` test case significantly 8c1e24048a t3427: add a clarifying comment 5efed0ecf9 rebase: fold git-rebase--common into the -p backend 68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone 2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive` 6180b20239 t3400: stop referring to the scripted rebase d5b581f228 Drop unused git-rebase--am.sh 814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation 6a289d45c0 grep: fix worktree case in submodules 870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching 8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data 09872f6418 grep: create a "is_fixed" member in "grep_pat" 8a35b540a9 grep: consistently use "p->fixed" in compile_regexp() 685668faaa grep: stop using a custom JIT stack with PCRE v1 34489239d0 grep: stop "using" a custom JIT stack with PCRE v2 04bef50c01 grep: remove overly paranoid BUG(...) code b65abcafc7 grep: use PCRE v2 for optimized fixed-string search 48de2a768c grep: remove the kwset optimization 45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern> 25754125ce grep: make the behavior for NUL-byte in patterns sane d316af059d grep tests: move binary pattern tests into their own file 471dac5d2c grep tests: move "grep binary" alongside the rest f463beb805 grep: inline the return value of a function call used only once b14cf112e2 t4210: skip more command-line encoding tests on MinGW 44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>" 4e2443b181 log tests: test regex backends in "--encode=<enc>" tests 90d21f9ebf list-objects-filter-options: make parser void 5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW 489fc9ee71 list-objects-filter-options: allow mult. --filter c2694952e3 strbuf: give URL-encoding API a char predicate fn cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list f56f764279 list-objects-filter-options: move error check up e987df5fe6 list-objects-filter: implement composite filters 842b00516a list-objects-filter-options: always supply *errbuf 7a7c7f4a6d list-objects-filter: put omits set in filter struct 9430147ca0 list-objects-filter: encapsulate filter components 4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c 60b7a92d84 Move repository_format_partial_clone to promisor-remote.c db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h} 75de085211 remote: add promisor and partial clone config to the doc 7e154badc0 partial-clone: add multiple remotes in the doc 9a4c507886 t0410: test fetching from many promisor remotes 5e46139376 builtin/fetch: remove unique promisor remote limitation fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote() faf2abf496 promisor-remote: use repository_format_partial_clone 9cfebc1f3b promisor-remote: add promisor_remote_reinit() 9e27beaa23 promisor-remote: implement promisor_remote_get_direct() 48de315817 Add initial support for many promisor remotes 2e860675b6 fetch-object: make functions return an error code c59c7c879e t0410: remove pipes after git commands git-subtree-dir: third_party/git git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
2020-05-22 18:46:45 +02:00
#, c-format
msgid "%s is okay\n"
msgstr "%s 可以\n"
#: builtin/bundle.c:58
msgid "Need a repository to create a bundle."
msgstr "需要一个仓库来创建包。"
#: builtin/bundle.c:62
msgid "Need a repository to unbundle."
msgstr "需要一个仓库来解包。"
#: builtin/cat-file.c:594
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
msgstr ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
#: builtin/cat-file.c:595
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
msgstr ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
#: builtin/cat-file.c:616
msgid "only one batch option may be specified"
msgstr "只能指定一个批处理选项"
#: builtin/cat-file.c:634
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<类型> 可以是其中之一blob、tree、commit、tag"
#: builtin/cat-file.c:635
msgid "show object type"
msgstr "显示对象类型"
#: builtin/cat-file.c:636
msgid "show object size"
msgstr "显示对象大小"
#: builtin/cat-file.c:638
msgid "exit with zero when there's no error"
msgstr "当没有错误时退出并返回零"
#: builtin/cat-file.c:639
msgid "pretty-print object's content"
msgstr "美观地打印对象的内容"
#: builtin/cat-file.c:641
msgid "for blob objects, run textconv on object's content"
msgstr "对于数据对象,对其内容做文本转换"
#: builtin/cat-file.c:643
msgid "for blob objects, run filters on object's content"
msgstr "对于数据对象,对其内容做过滤"
#: builtin/cat-file.c:644 git-submodule.sh:936
msgid "blob"
msgstr "数据对象"
#: builtin/cat-file.c:645
msgid "use a specific path for --textconv/--filters"
msgstr "对于 --textconv/--filters 使用一个特定的路径"
#: builtin/cat-file.c:647
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "允许 -s 和 -t 对损坏的对象生效"
#: builtin/cat-file.c:648
msgid "buffer --batch output"
msgstr "缓冲 --batch 的输出"
#: builtin/cat-file.c:650
msgid "show info and content of objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息和内容"
#: builtin/cat-file.c:654
msgid "show info about objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息"
#: builtin/cat-file.c:658
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
#: builtin/cat-file.c:660
msgid "show all objects with --batch or --batch-check"
msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
#: builtin/cat-file.c:662
msgid "do not order --batch-all-objects output"
msgstr "不要对 --batch-all-objects 的输出排序"
#: builtin/check-attr.c:13
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
#: builtin/check-attr.c:14
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
#: builtin/check-attr.c:21
msgid "report all attributes set on file"
msgstr "报告设置在文件上的所有属性"
#: builtin/check-attr.c:22
msgid "use .gitattributes only from the index"
msgstr "只使用索引中的 .gitattributes"
#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
msgid "read file names from stdin"
msgstr "从标准输入读出文件名"
#: builtin/check-attr.c:25 builtin/check-ignore.c:27
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538
#: builtin/worktree.c:507
msgid "suppress progress reporting"
msgstr "不显示进度报告"
#: builtin/check-ignore.c:29
msgid "show non-matching input paths"
msgstr "显示未匹配的输入路径"
#: builtin/check-ignore.c:31
msgid "ignore index when checking"
msgstr "检查时忽略索引"
#: builtin/check-ignore.c:160
msgid "cannot specify pathnames with --stdin"
msgstr "不能同时指定路径及 --stdin 参数"
#: builtin/check-ignore.c:163
msgid "-z only makes sense with --stdin"
msgstr "-z 需要和 --stdin 参数共用才有意义"
#: builtin/check-ignore.c:165
msgid "no path specified"
msgstr "未指定路径"
#: builtin/check-ignore.c:169
msgid "--quiet is only valid with a single pathname"
msgstr "参数 --quiet 只在提供一个路径名时有效"
#: builtin/check-ignore.c:171
msgid "cannot have both --quiet and --verbose"
msgstr "不能同时提供 --quiet 和 --verbose 参数"
#: builtin/check-ignore.c:174
msgid "--non-matching is only valid with --verbose"
msgstr "--non-matching 选项只在使用 --verbose 时有效"
#: builtin/check-mailmap.c:9
msgid "git check-mailmap [<options>] <contact>..."
msgstr "git check-mailmap [<选项>] <联系地址>..."
#: builtin/check-mailmap.c:14
msgid "also read contacts from stdin"
msgstr "还从标准输入读取联系地址"
#: builtin/check-mailmap.c:25
#, c-format
msgid "unable to parse contact: %s"
msgstr "不能解析联系地址:%s"
#: builtin/check-mailmap.c:48
msgid "no contacts specified"
msgstr "未指定联系地址"
#: builtin/checkout-index.c:131
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<选项>] [--] [<文件>...]"
#: builtin/checkout-index.c:148
msgid "stage should be between 1 and 3 or all"
msgstr "索引值应该取值 1 到 3 或者 all"
#: builtin/checkout-index.c:164
msgid "check out all files in the index"
msgstr "检出索引区的所有文件"
#: builtin/checkout-index.c:165
msgid "force overwrite of existing files"
msgstr "强制覆盖现有的文件"
#: builtin/checkout-index.c:167
msgid "no warning for existing files and files not in index"
msgstr "存在或不在索引中的文件都没有警告"
#: builtin/checkout-index.c:169
msgid "don't checkout new files"
msgstr "不检出新文件"
#: builtin/checkout-index.c:171
msgid "update stat information in the index file"
msgstr "更新索引中文件的状态信息"
#: builtin/checkout-index.c:175
msgid "read list of paths from the standard input"
msgstr "从标准输入读取路径列表"
#: builtin/checkout-index.c:177
msgid "write the content to temporary files"
msgstr "将内容写入临时文件"
#: builtin/checkout-index.c:178 builtin/column.c:31
#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
#: builtin/worktree.c:680
msgid "string"
msgstr "字符串"
#: builtin/checkout-index.c:179
msgid "when creating files, prepend <string>"
msgstr "在创建文件时,在前面加上 <字符串>"
#: builtin/checkout-index.c:181
msgid "copy out the files from named stage"
msgstr "从指定暂存区中拷出文件"
#: builtin/checkout.c:31
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<选项>] <分支>"
#: builtin/checkout.c:32
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
#: builtin/checkout.c:37
msgid "git switch [<options>] [<branch>]"
msgstr "git switch [<选项>] [<分支>]"
#: builtin/checkout.c:42
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
#: builtin/checkout.c:172 builtin/checkout.c:211
#, c-format
msgid "path '%s' does not have our version"
msgstr "路径 '%s' 没有我们的版本"
#: builtin/checkout.c:174 builtin/checkout.c:213
#, c-format
msgid "path '%s' does not have their version"
msgstr "路径 '%s' 没有他们的版本"
#: builtin/checkout.c:190
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路径 '%s' 没有全部必需的版本"
#: builtin/checkout.c:240
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必需的版本"
#: builtin/checkout.c:258
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s':无法合并"
#: builtin/checkout.c:274
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加合并结果"
#: builtin/checkout.c:374
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "重新创建了 %d 个合并冲突"
msgstr[1] "重新创建了 %d 个合并冲突"
#: builtin/checkout.c:379
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "从 %2$s 更新了 %1$d 个路径"
msgstr[1] "从 %2$s 更新了 %1$d 个路径"
#: builtin/checkout.c:386
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "从索引区更新了 %d 个路径"
msgstr[1] "从索引区更新了 %d 个路径"
#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415
#: builtin/checkout.c:419
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' 不能在更新路径时使用"
#: builtin/checkout.c:422 builtin/checkout.c:425
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' 不能和 %s 同时使用"
#: builtin/checkout.c:429
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同时更新路径并切换到分支'%s'。"
#: builtin/checkout.c:433
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "'%s' 或 '%s' 都没有指定"
#: builtin/checkout.c:437
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "未指定 '%2$s' 时,必须使用 '%1$s'"
#: builtin/checkout.c:442 builtin/checkout.c:447
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
#: builtin/checkout.c:506 builtin/checkout.c:513
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
#: builtin/checkout.c:679
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
#: builtin/checkout.c:729
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
"不能继续,下列文件有暂存的修改:\n"
"%s"
#: builtin/checkout.c:736
#, c-format
msgid "staged changes in the following files may be lost: %s"
msgstr "下列文件暂存的修改可能会丢失:%s"
#: builtin/checkout.c:833
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
#: builtin/checkout.c:875
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
#: builtin/checkout.c:879 builtin/clone.c:714
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
#: builtin/checkout.c:883
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
#: builtin/checkout.c:886
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
#: builtin/checkout.c:890
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
#: builtin/checkout.c:892 builtin/checkout.c:1289
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
#: builtin/checkout.c:894
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者:注意保持前导空格
#: builtin/checkout.c:945
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
#: builtin/checkout.c:951
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"any of your branches:\n"
"\n"
"%s\n"
msgid_plural ""
"Warning: you are leaving %d commits behind, not connected to\n"
"any of your branches:\n"
"\n"
"%s\n"
msgstr[0] ""
"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
"\n"
"%s\n"
msgstr[1] ""
"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
"\n"
"%s\n"
#: builtin/checkout.c:970
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
"to do so with:\n"
"\n"
" git branch <new-branch-name> %s\n"
"\n"
msgid_plural ""
"If you want to keep them by creating a new branch, this may be a good time\n"
"to do so with:\n"
"\n"
" git branch <new-branch-name> %s\n"
"\n"
msgstr[0] ""
"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
"如下操作:\n"
"\n"
" git branch <新分支名> %s\n"
"\n"
msgstr[1] ""
"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
"如下操作:\n"
"\n"
" git branch <新分支名> %s\n"
"\n"
#: builtin/checkout.c:1005
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
#: builtin/checkout.c:1009
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
#: builtin/checkout.c:1049 builtin/checkout.c:1284
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
#: builtin/checkout.c:1176
msgid "only one reference expected"
msgstr "预期只有一个引用"
#: builtin/checkout.c:1193
#, c-format
msgid "only one reference expected, %d given."
msgstr "应只有一个引用,却给出了 %d 个"
#: builtin/checkout.c:1230
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
"'%s' 既可以是一个本地文件,也可以是一个跟踪分支。\n"
"请使用 --(和可选的 --no-guess来消除歧义"
#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用:%s"
#: builtin/checkout.c:1256 builtin/checkout.c:1618
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树:%s"
#: builtin/checkout.c:1303
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "期望一个分支,得到标签 '%s'"
#: builtin/checkout.c:1305
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "期望一个分支,得到远程分支 '%s'"
#: builtin/checkout.c:1306 builtin/checkout.c:1314
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "期望一个分支,得到 '%s'"
#: builtin/checkout.c:1309
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "期望一个分支,得到提交 '%s'"
#: builtin/checkout.c:1325
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
"不能在合并时切换分支\n"
"考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
#: builtin/checkout.c:1329
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
"不能在一个 am 会话期间切换分支\n"
"考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
#: builtin/checkout.c:1333
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
"不能在变基时切换分支\n"
"考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
#: builtin/checkout.c:1337
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
"不能在拣选时切换分支\n"
"考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
#: builtin/checkout.c:1341
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
"不能在还原时切换分支\n"
"考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
#: builtin/checkout.c:1345
msgid "you are switching branch while bisecting"
msgstr "您在执行二分查找时切换分支"
#: builtin/checkout.c:1352
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
#: builtin/checkout.c:1378 builtin/checkout.c:1383
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
#: builtin/checkout.c:1380
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' 不带 <起始点>"
#: builtin/checkout.c:1388
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
#: builtin/checkout.c:1395
msgid "missing branch or commit argument"
msgstr "缺少分支或提交参数"
#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
#: builtin/send-pack.c:174
msgid "force progress reporting"
msgstr "强制显示进度报告"
#: builtin/checkout.c:1438
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三方合并"
#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
msgid "style"
msgstr "风格"
#: builtin/checkout.c:1440
msgid "conflict style (merge or diff3)"
msgstr "冲突输出风格merge 或 diff3"
#: builtin/checkout.c:1452 builtin/worktree.c:504
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的提交分离"
#: builtin/checkout.c:1453
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信息"
#: builtin/checkout.c:1455
msgid "force checkout (throw away local modifications)"
msgstr "强制检出(丢弃本地修改)"
#: builtin/checkout.c:1457
msgid "new-branch"
msgstr "新分支"
#: builtin/checkout.c:1457
msgid "new unparented branch"
msgstr "新的没有父提交的分支"
#: builtin/checkout.c:1459 builtin/merge.c:288
msgid "update ignored files (default)"
msgstr "更新忽略的文件(默认)"
#: builtin/checkout.c:1462
msgid "do not check if another worktree is holding the given ref"
msgstr "不检查指定的引用是否被其他工作区所占用"
#: builtin/checkout.c:1475
msgid "checkout our version for unmerged files"
msgstr "对尚未合并的文件检出我们的版本"
#: builtin/checkout.c:1478
msgid "checkout their version for unmerged files"
msgstr "对尚未合并的文件检出他们的版本"
#: builtin/checkout.c:1482
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径不做稀疏检出的限制"
#: builtin/checkout.c:1533
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b、-B 和 --orphan 是互斥的"
#: builtin/checkout.c:1536
msgid "-p and --overlay are mutually exclusive"
msgstr "-p 和 --overlay 互斥"
#: builtin/checkout.c:1573
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
#: builtin/checkout.c:1578
msgid "missing branch name; try -b"
msgstr "缺少分支名,尝试 -b"
#: builtin/checkout.c:1611
#, c-format
msgid "could not resolve %s"
msgstr "无法解析 %s"
#: builtin/checkout.c:1623
msgid "you must specify path(s) to restore"
msgstr "您必须指定一个要恢复的路径"
#: builtin/checkout.c:1631
msgid "invalid path specification"
msgstr "无效的路径规格"
#: builtin/checkout.c:1638
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'"
#: builtin/checkout.c:1642
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout--detach 不能接收路径参数 '%s'"
#: builtin/checkout.c:1646
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
"git checkout在从索引检出时--ours/--theirs、--force 和 --merge 不兼容。"
#: builtin/checkout.c:1666
#, c-format
msgid ""
"'%s' matched more than one remote tracking branch.\n"
"We found %d remotes with a reference that matched. So we fell back\n"
"on trying to resolve the argument as a path, but failed there too!\n"
"\n"
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"\n"
" git checkout --track origin/<name>\n"
"\n"
"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
"one remote, e.g. the 'origin' remote, consider setting\n"
"checkout.defaultRemote=origin in your config."
msgstr ""
"'%s' 匹配了一个以上的远程跟踪分支。\n"
"我们发现 %d 个远程仓库具有同名分支。所以我们转而尝试将这个参数解析为\n"
"路径,但是也失败了!\n"
"\n"
"如果您想要检出一个远程跟踪分支,例如在远程仓库 'origin' 上的,您可以\n"
"使用分支全名和 --track 选项:\n"
"\n"
" git checkout --track origin/<name>\n"
"\n"
"如果您总是喜欢使用模糊的简短分支名 <name>,而不喜欢如 'origin' 的远程\n"
"仓库名,可以在配置中设置 checkout.defaultRemote=origin。"
#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
msgid "branch"
msgstr "分支"
#: builtin/checkout.c:1692
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
#: builtin/checkout.c:1694
msgid "create/reset and checkout a branch"
msgstr "创建/重置并检出一个分支"
#: builtin/checkout.c:1695
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
#: builtin/checkout.c:1697
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "二次猜测 'git checkout <无此分支>'(默认)"
#: builtin/checkout.c:1698
msgid "use overlay mode (default)"
msgstr "使用叠加模式(默认)"
#: builtin/checkout.c:1734
msgid "create and switch to a new branch"
msgstr "创建并切换一个新分支"
#: builtin/checkout.c:1736
msgid "create/reset and switch to a branch"
msgstr "创建/重置并切换一个分支"
#: builtin/checkout.c:1738
msgid "second guess 'git switch <no-such-branch>'"
msgstr "二次猜测 'git switch <无此分支>'"
#: builtin/checkout.c:1740
msgid "throw away local modifications"
msgstr "丢弃本地修改"
#: builtin/checkout.c:1772
msgid "which tree-ish to checkout from"
msgstr "要检出哪一个树"
#: builtin/checkout.c:1774
msgid "restore the index"
msgstr "恢复索引"
#: builtin/checkout.c:1776
msgid "restore the working tree (default)"
msgstr "恢复工作区(默认)"
#: builtin/checkout.c:1778
msgid "ignore unmerged entries"
msgstr "忽略未合并条目"
#: builtin/checkout.c:1779
msgid "use overlay mode"
msgstr "使用叠加模式"
#: builtin/clean.c:28
msgid ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
msgstr ""
"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
#: builtin/clean.c:32
#, c-format
msgid "Removing %s\n"
msgstr "正删除 %s\n"
#: builtin/clean.c:33
#, c-format
msgid "Would remove %s\n"
msgstr "将删除 %s\n"
#: builtin/clean.c:34
#, c-format
msgid "Skipping repository %s\n"
msgstr "忽略仓库 %s\n"
#: builtin/clean.c:35
#, c-format
msgid "Would skip repository %s\n"
msgstr "将忽略仓库 %s\n"
#: builtin/clean.c:36
#, c-format
msgid "failed to remove %s"
msgstr "删除 %s 失败"
#: builtin/clean.c:37
#, c-format
msgid "could not lstat %s\n"
msgstr "不能对 %s 调用 lstat\n"
#: builtin/clean.c:300 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
"1 - select a numbered item\n"
"foo - select item based on unique prefix\n"
" - (empty) select nothing\n"
msgstr ""
"帮助:\n"
"1 - 通过编号选择一个选项\n"
"foo - 通过唯一前缀选择一个选项\n"
" - (空)什么也不选择\n"
#: builtin/clean.c:304 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
"1 - select a single item\n"
"3-5 - select a range of items\n"
"2-3,6-9 - select multiple ranges\n"
"foo - select item based on unique prefix\n"
"-... - unselect specified items\n"
"* - choose all items\n"
" - (empty) finish selecting\n"
msgstr ""
"帮助:\n"
"1 - 选择一个选项\n"
"3-5 - 选择一个范围内的所有选项\n"
"2-3,6-9 - 选择多个范围内的所有选项\n"
"foo - 通过唯一前缀选择一个选项\n"
"-... - 反选特定的选项\n"
"* - 选择所有选项\n"
" - (空)结束选择\n"
#: builtin/clean.c:520 git-add--interactive.perl:568
#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "嗯(%s\n"
#: builtin/clean.c:662
#, c-format
msgid "Input ignore patterns>> "
msgstr "输入模版以排除条目>> "
#: builtin/clean.c:699
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "警告:无法找到和 %s 匹配的条目"
#: builtin/clean.c:720
msgid "Select items to delete"
msgstr "选择要删除的条目"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:761
#, c-format
msgid "Remove %s [y/N]? "
msgstr "删除 %s [y/N]"
#: builtin/clean.c:786 git-add--interactive.perl:1763
#, c-format
msgid "Bye.\n"
msgstr "再见。\n"
#: builtin/clean.c:794
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
"select by numbers - select items to be deleted by numbers\n"
"ask each - confirm each deletion (like \"rm -i\")\n"
"quit - stop cleaning\n"
"help - this screen\n"
"? - help for prompt selection"
msgstr ""
"clean - 开始清理\n"
"filter by pattern - 通过模版排除要删除的条目\n"
"select by numbers - 通过数字选择要删除的条目\n"
"ask each - 针对删除逐一询问(就像 \"rm -i\"\n"
"quit - 停止删除并退出\n"
"help - 显示本帮助\n"
"? - 显示如何在提示符下选择的帮助"
#: builtin/clean.c:821 git-add--interactive.perl:1849
msgid "*** Commands ***"
msgstr "*** 命令 ***"
#: builtin/clean.c:822 git-add--interactive.perl:1846
msgid "What now"
msgstr "请选择"
#: builtin/clean.c:830
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "将删除如下条目:"
msgstr[1] "将删除如下条目:"
#: builtin/clean.c:846
msgid "No more files to clean, exiting."
msgstr "没有要清理的文件,退出。"
#: builtin/clean.c:908
msgid "do not print names of files removed"
msgstr "不打印删除文件的名称"
#: builtin/clean.c:910
msgid "force"
msgstr "强制"
#: builtin/clean.c:911
msgid "interactive cleaning"
msgstr "交互式清除"
#: builtin/clean.c:913
msgid "remove whole directories"
msgstr "删除整个目录"
#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "模式"
#: builtin/clean.c:915
msgid "add <pattern> to ignore rules"
msgstr "添加 <模式> 到忽略规则"
#: builtin/clean.c:916
msgid "remove ignored files, too"
msgstr "也删除忽略的文件"
#: builtin/clean.c:918
msgid "remove only ignored files"
msgstr "只删除忽略的文件"
#: builtin/clean.c:936
msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能同时使用"
#: builtin/clean.c:940
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
#: builtin/clean.c:943
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
#: builtin/clone.c:46
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
#: builtin/clone.c:93
msgid "don't create a checkout"
msgstr "不创建一个检出"
#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
msgid "create a bare repository"
msgstr "创建一个纯仓库"
#: builtin/clone.c:98
msgid "create a mirror repository (implies bare)"
msgstr "创建一个镜像仓库(也是纯仓库)"
#: builtin/clone.c:100
msgid "to clone from a local repository"
msgstr "从本地仓库克隆"
#: builtin/clone.c:102
msgid "don't use local hardlinks, always copy"
msgstr "不使用本地硬链接,始终复制"
#: builtin/clone.c:104
msgid "setup as shared repository"
msgstr "设置为共享仓库"
#: builtin/clone.c:107
msgid "pathspec"
msgstr "路径规格"
#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "在克隆时初始化子模组"
#: builtin/clone.c:110
msgid "number of submodules cloned in parallel"
msgstr "并发克隆的子模组的数量"
#: builtin/clone.c:111 builtin/init-db.c:486
msgid "template-directory"
msgstr "模板目录"
#: builtin/clone.c:112 builtin/init-db.c:487
msgid "directory from which templates will be used"
msgstr "模板目录将被使用"
#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
#: builtin/submodule--helper.c:1860
msgid "reference repository"
msgstr "参考仓库"
#: builtin/clone.c:118 builtin/submodule--helper.c:1382
#: builtin/submodule--helper.c:1862
msgid "use --reference only while cloning"
msgstr "仅在克隆时参考 --reference 指向的本地仓库"
#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
#: builtin/pack-objects.c:3314 builtin/repack.c:319
msgid "name"
msgstr "名称"
#: builtin/clone.c:120
msgid "use <name> instead of 'origin' to track upstream"
msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
#: builtin/clone.c:122
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "检出 <分支> 而不是远程 HEAD"
#: builtin/clone.c:124
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
#: builtin/pull.c:226
msgid "depth"
msgstr "深度"
#: builtin/clone.c:126
msgid "create a shallow clone of that depth"
msgstr "创建一个指定深度的浅克隆"
#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
msgid "time"
msgstr "时间"
#: builtin/clone.c:128
msgid "create a shallow clone since a specific time"
msgstr "从一个特定时间创建一个浅克隆"
#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
#: builtin/rebase.c:1395
msgid "revision"
msgstr "版本"
#: builtin/clone.c:130 builtin/fetch.c:157
msgid "deepen history of shallow clone, excluding rev"
msgstr "深化浅克隆的历史,除了特定版本"
#: builtin/clone.c:132
msgid "clone only one branch, HEAD or --branch"
msgstr "只克隆一个分支、HEAD 或 --branch"
#: builtin/clone.c:134
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "不要克隆任何标签,并且后续获取操作也不下载它们"
#: builtin/clone.c:136
msgid "any cloned submodules will be shallow"
msgstr "子模组将以浅下载模式克隆"
#: builtin/clone.c:137 builtin/init-db.c:495
msgid "gitdir"
msgstr "git目录"
#: builtin/clone.c:138 builtin/init-db.c:496
msgid "separate git dir from working tree"
msgstr "git目录和工作区分离"
#: builtin/clone.c:139
msgid "key=value"
msgstr "key=value"
#: builtin/clone.c:140
msgid "set config inside the new repository"
msgstr "在新仓库中设置配置信息"
#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:172
msgid "server-specific"
msgstr "server-specific"
#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
#: builtin/push.c:585 builtin/send-pack.c:173
msgid "option to transmit"
msgstr "传输选项"
#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
#: builtin/push.c:586
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 地址"
#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
#: builtin/push.c:588
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 地址"
#: builtin/clone.c:149
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
#: builtin/clone.c:285
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
"无法猜到目录名。\n"
"请在命令行指定一个目录"
#: builtin/clone.c:338
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
#: builtin/clone.c:411
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"
#: builtin/clone.c:428
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "无法在 '%s' 上启动迭代器"
#: builtin/clone.c:453
#, c-format
msgid "failed to unlink '%s'"
msgstr "删除 '%s' 失败"
#: builtin/clone.c:458
#, c-format
msgid "failed to create link '%s'"
msgstr "创建链接 '%s' 失败"
#: builtin/clone.c:462
#, c-format
msgid "failed to copy file to '%s'"
msgstr "拷贝文件至 '%s' 失败"
#: builtin/clone.c:467
#, c-format
msgid "failed to iterate over '%s'"
msgstr "无法在 '%s' 上迭代"
#: builtin/clone.c:492
#, c-format
msgid "done.\n"
msgstr "完成。\n"
#: builtin/clone.c:506
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
"克隆成功,但是检出失败。\n"
"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
"'git restore --source=HEAD :/' 重试\n"
#: builtin/clone.c:583
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
#: builtin/clone.c:702
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
#: builtin/clone.c:752
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
#: builtin/clone.c:783
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
#: builtin/clone.c:833
msgid "unable to write parameters to config file"
msgstr "无法将参数写入配置文件"
#: builtin/clone.c:896
msgid "cannot repack to clean up"
msgstr "无法执行 repack 来清理"
#: builtin/clone.c:898
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
#: builtin/clone.c:938 builtin/receive-pack.c:1950
msgid "Too many arguments."
msgstr "太多参数。"
#: builtin/clone.c:942
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库来克隆。"
#: builtin/clone.c:955
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
#: builtin/clone.c:958
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
#: builtin/clone.c:971
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' 不存在"
#: builtin/clone.c:977 builtin/fetch.c:1660
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数"
#: builtin/clone.c:987
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
#: builtin/clone.c:997
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
#: builtin/worktree.c:303 builtin/worktree.c:335
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
#: builtin/clone.c:1017
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能创建工作区目录 '%s'"
#: builtin/clone.c:1037
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
#: builtin/clone.c:1039
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
#: builtin/clone.c:1063
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
#: builtin/clone.c:1124
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
#: builtin/clone.c:1126
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
#: builtin/clone.c:1128
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
#: builtin/clone.c:1130
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。"
#: builtin/clone.c:1133
msgid "source repository is shallow, ignoring --local"
msgstr "源仓库是浅克隆,忽略 --local"
#: builtin/clone.c:1138
msgid "--local is ignored"
msgstr "--local 被忽略"
#: builtin/clone.c:1215 builtin/clone.c:1223
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
#: builtin/clone.c:1226
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
#: builtin/column.c:10
msgid "git column [<options>]"
msgstr "git column [<选项>]"
#: builtin/column.c:27
msgid "lookup config vars"
msgstr "查找配置变量"
#: builtin/column.c:28 builtin/column.c:29
msgid "layout to use"
msgstr "要使用的布局"
#: builtin/column.c:30
msgid "Maximum width"
msgstr "最大宽度"
#: builtin/column.c:31
msgid "Padding space on left border"
msgstr "左边框的填充空间"
#: builtin/column.c:32
msgid "Padding space on right border"
msgstr "右边框的填充空间"
#: builtin/column.c:33
msgid "Padding space between columns"
msgstr "两列之间的填充空间"
#: builtin/column.c:51
msgid "--command must be the first argument"
msgstr "--command 必须是第一个参数"
#: builtin/commit-tree.c:18
msgid ""
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
"<file>)...] <tree>"
msgstr ""
"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件"
">)...] <树>"
#: builtin/commit-tree.c:31
#, c-format
msgid "duplicate parent %s ignored"
msgstr "忽略重复的父提交 %s"
#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
#, c-format
msgid "not a valid object name %s"
msgstr "不是一个有效的对象名 %s"
#: builtin/commit-tree.c:93
#, c-format
msgid "git commit-tree: failed to open '%s'"
msgstr "git commit-tree无法打开 '%s'"
#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr "git commit-tree无法读取 '%s'"
#: builtin/commit-tree.c:98
#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr "git commit-tree无法关闭 '%s'"
#: builtin/commit-tree.c:111
msgid "parent"
msgstr "父提交"
#: builtin/commit-tree.c:112
msgid "id of a parent commit object"
msgstr "父提交对象 ID"
#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
#: builtin/tag.c:412
msgid "message"
msgstr "说明"
#: builtin/commit-tree.c:115 builtin/commit.c:1500
msgid "commit message"
msgstr "提交说明"
#: builtin/commit-tree.c:118
msgid "read commit log message from file"
msgstr "从文件中读取提交说明"
#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
#: builtin/pull.c:194 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG 提交签名"
#: builtin/commit-tree.c:133
msgid "must give exactly one tree"
msgstr "必须精确地提供一个树"
#: builtin/commit-tree.c:140
msgid "git commit-tree: failed to read"
msgstr "git commit-tree读取失败"
#: builtin/commit.c:41
msgid "git commit [<options>] [--] <pathspec>..."
msgstr "git commit [<选项>] [--] <路径规格>..."
#: builtin/commit.c:46
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<选项>] [--] <路径规格>..."
#: builtin/commit.c:51
msgid ""
"You asked to amend the most recent commit, but doing so would make\n"
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
#: builtin/commit.c:56
msgid ""
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
"If you wish to commit it anyway, use:\n"
"\n"
" git commit --allow-empty\n"
"\n"
msgstr ""
"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
"也要提交,使用命令:\n"
"\n"
" git commit --allow-empty\n"
"\n"
#: builtin/commit.c:63
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
msgstr "否则,请使用 'git cherry-pick --skip'\n"
#: builtin/commit.c:66
msgid ""
"and then use:\n"
"\n"
" git cherry-pick --continue\n"
"\n"
"to resume cherry-picking the remaining commits.\n"
"If you wish to skip this commit, use:\n"
"\n"
" git cherry-pick --skip\n"
"\n"
msgstr ""
"然后使用:\n"
"\n"
" git cherry-pick --continue\n"
"\n"
"来继续拣选剩余提交。如果您想跳过此提交,使用:\n"
"\n"
" git cherry-pick --skip\n"
"\n"
#: builtin/commit.c:315
msgid "failed to unpack HEAD tree object"
msgstr "解包 HEAD 树对象失败"
#: builtin/commit.c:356
msgid "unable to create temporary index"
msgstr "不能创建临时索引"
#: builtin/commit.c:362
msgid "interactive add failed"
msgstr "交互式添加失败"
#: builtin/commit.c:376
msgid "unable to update temporary index"
msgstr "无法更新临时索引"
#: builtin/commit.c:378
msgid "Failed to update main cache tree"
msgstr "不能更新树的主缓存"
#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
msgid "unable to write new_index file"
msgstr "无法写 new_index 文件"
#: builtin/commit.c:455
msgid "cannot do a partial commit during a merge."
msgstr "在合并过程中不能做部分提交。"
#: builtin/commit.c:457
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在拣选过程中不能做部分提交。"
#: builtin/commit.c:465
msgid "cannot read the index"
msgstr "无法读取索引"
#: builtin/commit.c:484
msgid "unable to write temporary index file"
msgstr "无法写临时索引文件"
#: builtin/commit.c:582
#, c-format
msgid "commit '%s' lacks author header"
msgstr "提交 '%s' 缺少作者信息"
#: builtin/commit.c:584
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "提交 '%s' 有格式错误的作者信息"
#: builtin/commit.c:603
msgid "malformed --author parameter"
msgstr "格式错误的 --author 参数"
#: builtin/commit.c:656
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "无法选择一个未被当前提交说明使用的注释字符"
#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"
#: builtin/commit.c:706 builtin/shortlog.c:319
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(正从标准输入中读取日志信息)\n"
#: builtin/commit.c:708
msgid "could not read log from standard input"
msgstr "不能从标准输入中读取日志信息"
#: builtin/commit.c:712
#, c-format
msgid "could not read log file '%s'"
msgstr "不能读取日志文件 '%s'"
#: builtin/commit.c:743 builtin/commit.c:759
msgid "could not read SQUASH_MSG"
msgstr "不能读取 SQUASH_MSG"
#: builtin/commit.c:750
msgid "could not read MERGE_MSG"
msgstr "不能读取 MERGE_MSG"
#: builtin/commit.c:810
msgid "could not write commit template"
msgstr "不能写提交模版"
#: builtin/commit.c:829
#, c-format
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
"If this is not correct, please remove the file\n"
"\t%s\n"
"and try again.\n"
msgstr ""
"\n"
"似乎您正在做一个合并提交。如果不对,请删除文件\n"
"\t%s\n"
"然后重试。\n"
#: builtin/commit.c:834
#, c-format
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
"If this is not correct, please remove the file\n"
"\t%s\n"
"and try again.\n"
msgstr ""
"\n"
"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
"\t%s\n"
"然后重试。\n"
#: builtin/commit.c:847
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
"说明将会终止提交。\n"
#: builtin/commit.c:855
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
"也可以删除它们。一个空的提交说明将会终止提交。\n"
# 译者:为保证在输出中对齐,注意调整句中空格!
#: builtin/commit.c:872
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者 %.*s <%.*s>"
# 译者:为保证在输出中对齐,注意调整句中空格!
#: builtin/commit.c:880
#, c-format
msgid "%sDate: %s"
msgstr "%s日期 %s"
# 译者:为保证在输出中对齐,注意调整句中空格!
#: builtin/commit.c:887
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s提交者%.*s <%.*s>"
#: builtin/commit.c:905
msgid "Cannot read index"
msgstr "无法读取索引"
#: builtin/commit.c:972
msgid "Error building trees"
msgstr "无法创建树对象"
#: builtin/commit.c:986 builtin/tag.c:275
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
#: builtin/commit.c:1030
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配"
#: builtin/commit.c:1044
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "无效的忽略模式 '%s'"
#: builtin/commit.c:1062 builtin/commit.c:1304
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件参数 '%s'"
#: builtin/commit.c:1102
msgid "--long and -z are incompatible"
msgstr "--long 和 -z 选项不兼容"
#: builtin/commit.c:1146
msgid "Using both --reset-author and --author does not make sense"
msgstr "同时使用 --reset-author 和 --author 没有意义"
#: builtin/commit.c:1155
msgid "You have nothing to amend."
msgstr "您没有可修补的提交。"
#: builtin/commit.c:1158
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
#: builtin/commit.c:1160
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
#: builtin/commit.c:1163
msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash 和 --fixup 不能同时使用"
#: builtin/commit.c:1173
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
#: builtin/commit.c:1175
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
#: builtin/commit.c:1183
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
#: builtin/commit.c:1200
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
#: builtin/commit.c:1202
msgid "No paths with --include/--only does not make sense."
msgstr "参数 --include/--only 不跟路径没有意义。"
#: builtin/commit.c:1208
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
#: builtin/commit.c:1339 builtin/commit.c:1523
msgid "show status concisely"
msgstr "以简洁的格式显示状态"
#: builtin/commit.c:1341 builtin/commit.c:1525
msgid "show branch information"
msgstr "显示分支信息"
#: builtin/commit.c:1343
msgid "show stash information"
msgstr "显示贮藏区信息"
#: builtin/commit.c:1345 builtin/commit.c:1527
msgid "compute full ahead/behind values"
msgstr "计算完整的领先/落后值"
#: builtin/commit.c:1347
msgid "version"
msgstr "版本"
#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
#: builtin/worktree.c:651
msgid "machine-readable output"
msgstr "机器可读的输出"
#: builtin/commit.c:1350 builtin/commit.c:1531
msgid "show status in long format (default)"
msgstr "以长格式显示状态(默认)"
#: builtin/commit.c:1353 builtin/commit.c:1534
msgid "terminate entries with NUL"
msgstr "条目以 NUL 字符结尾"
#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
msgid "mode"
msgstr "模式"
#: builtin/commit.c:1356 builtin/commit.c:1537
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "显示未跟踪的文件“模式”的可选参数all、normal、no。默认all"
#: builtin/commit.c:1360
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
"显示已忽略的文件可选模式traditional、matching、no。默认traditional"
#: builtin/commit.c:1362 parse-options.h:179
msgid "when"
msgstr "何时"
#: builtin/commit.c:1363
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略子模组的更改“何时”的可选参数all、dirty、untracked。默认all"
#: builtin/commit.c:1365
msgid "list untracked files in columns"
msgstr "以列的方式显示未跟踪的文件"
#: builtin/commit.c:1366
msgid "do not detect renames"
msgstr "不检测重命名"
#: builtin/commit.c:1368
msgid "detect renames, optionally set similarity index"
msgstr "检测重命名,可以设置索引相似度"
#: builtin/commit.c:1388
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "不支持已忽略和未跟踪文件参数的组合"
#: builtin/commit.c:1493
msgid "suppress summary after successful commit"
msgstr "提交成功后不显示概述信息"
#: builtin/commit.c:1494
msgid "show diff in commit message template"
msgstr "在提交说明模板里显示差异"
#: builtin/commit.c:1496
msgid "Commit message options"
msgstr "提交说明选项"
#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
msgid "read message from file"
msgstr "从文件中读取提交说明"
#: builtin/commit.c:1498
msgid "author"
msgstr "作者"
#: builtin/commit.c:1498
msgid "override author for commit"
msgstr "提交时覆盖作者"
#: builtin/commit.c:1499 builtin/gc.c:539
msgid "date"
msgstr "日期"
#: builtin/commit.c:1499
msgid "override date for commit"
msgstr "提交时覆盖日期"
#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
msgid "commit"
msgstr "提交"
#: builtin/commit.c:1501
msgid "reuse and edit message from specified commit"
msgstr "重用并编辑指定提交的提交说明"
#: builtin/commit.c:1502
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交说明"
#: builtin/commit.c:1503
msgid "use autosquash formatted message to fixup specified commit"
msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
#: builtin/commit.c:1504
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
#: builtin/commit.c:1505
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
#: builtin/pull.c:163 builtin/revert.c:110
msgid "add Signed-off-by:"
msgstr "添加 Signed-off-by: 签名"
#: builtin/commit.c:1507
msgid "use specified template file"
msgstr "使用指定的模板文件"
#: builtin/commit.c:1508
msgid "force edit of commit"
msgstr "强制编辑提交"
#: builtin/commit.c:1510
msgid "include status in commit message template"
msgstr "在提交说明模板里包含状态信息"
#: builtin/commit.c:1515
msgid "Commit contents options"
msgstr "提交内容选项"
#: builtin/commit.c:1516
msgid "commit all changed files"
msgstr "提交所有改动的文件"
#: builtin/commit.c:1517
msgid "add specified files to index for commit"
msgstr "添加指定的文件到索引区等待提交"
#: builtin/commit.c:1518
msgid "interactively add files"
msgstr "交互式添加文件"
#: builtin/commit.c:1519
msgid "interactively add changes"
msgstr "交互式添加变更"
#: builtin/commit.c:1520
msgid "commit only specified files"
msgstr "只提交指定的文件"
#: builtin/commit.c:1521
msgid "bypass pre-commit and commit-msg hooks"
msgstr "绕过 pre-commit 和 commit-msg 钩子"
#: builtin/commit.c:1522
msgid "show what would be committed"
msgstr "显示将要提交的内容"
#: builtin/commit.c:1535
msgid "amend previous commit"
msgstr "修改先前的提交"
#: builtin/commit.c:1536
msgid "bypass post-rewrite hook"
msgstr "绕过 post-rewrite 钩子"
#: builtin/commit.c:1541
msgid "ok to record an empty change"
msgstr "允许一个空提交"
#: builtin/commit.c:1543
msgid "ok to record a change with an empty message"
msgstr "允许空的提交说明"
#: builtin/commit.c:1616
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "损坏的 MERGE_HEAD 文件(%s"
#: builtin/commit.c:1623
msgid "could not read MERGE_MODE"
msgstr "不能读取 MERGE_MODE"
#: builtin/commit.c:1642
#, c-format
msgid "could not read commit message: %s"
msgstr "不能读取提交说明:%s"
#: builtin/commit.c:1649
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止提交因为提交说明为空。\n"
#: builtin/commit.c:1654
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "终止提交;您未更改来自模版的提交说明。\n"
#: builtin/commit.c:1688
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
"not exceeded, and then \"git restore --staged :/\" to recover."
msgstr ""
"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满或\n"
"磁盘配额已耗尽,然后执行 \"git restore --staged :/\" 恢复。"
#: builtin/commit-graph.c:11
msgid "git commit-graph [--object-dir <objdir>]"
msgstr "git commit-graph [--object-dir <对象目录>]"
#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
msgid "git commit-graph read [--object-dir <objdir>]"
msgstr "git commit-graph read [--object-dir <对象目录>]"
#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
msgstr "git commit-graph verify [--object-dir <对象目录>] [--shallow]"
#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
"reachable|--stdin-packs|--stdin-commits] <split options>"
msgstr "git commit-graph write [--object-dir <对象目录>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] <split options>"
#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
#: builtin/log.c:1584
msgid "dir"
msgstr "目录"
#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
msgid "The object directory to store the graph"
msgstr "保存图形的对象目录"
#: builtin/commit-graph.c:57
msgid "if the commit-graph is split, only verify the tip file"
msgstr "如果提交图形被拆分,只验证头一个文件"
#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr "无法打开提交图形 '%s'"
#: builtin/commit-graph.c:164
msgid "start walk at all refs"
msgstr "开始遍历所有引用"
#: builtin/commit-graph.c:166
msgid "scan pack-indexes listed by stdin for commits"
msgstr "从标准输入中的包索引文件列表中扫描提交"
#: builtin/commit-graph.c:168
msgid "start walk at commits listed by stdin"
msgstr "从标准输入中的提交开始扫描"
#: builtin/commit-graph.c:170
msgid "include all commits already in the commit-graph file"
msgstr "包含 commit-graph 文件中已有所有提交"
#: builtin/commit-graph.c:172
msgid "allow writing an incremental commit-graph file"
msgstr "允许写一个增量提交图形文件"
#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
msgid "maximum number of commits in a non-base split commit-graph"
msgstr "在非基本拆分提交图形中的最大提交数"
#: builtin/commit-graph.c:176
msgid "maximum ratio between two levels of a split commit-graph"
msgstr "一个拆分提交图形的两个级别之间的最大比率"
#: builtin/commit-graph.c:191
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
#: builtin/config.c:11
msgid "git config [<options>]"
msgstr "git config [<选项>]"
#: builtin/config.c:103 builtin/env--helper.c:23
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "未能识别的 --type 参数,%s"
#: builtin/config.c:115
msgid "only one type at a time"
msgstr "一次只能一个类型"
#: builtin/config.c:124
msgid "Config file location"
msgstr "配置文件位置"
#: builtin/config.c:125
msgid "use global config file"
msgstr "使用全局配置文件"
#: builtin/config.c:126
msgid "use system config file"
msgstr "使用系统级配置文件"
#: builtin/config.c:127
msgid "use repository config file"
msgstr "使用仓库级配置文件"
#: builtin/config.c:128
msgid "use per-worktree config file"
msgstr "使用工作区级别的配置文件"
#: builtin/config.c:129
msgid "use given config file"
msgstr "使用指定的配置文件"
#: builtin/config.c:130
msgid "blob-id"
msgstr "数据对象 ID"
#: builtin/config.c:130
msgid "read config from given blob object"
msgstr "从给定的数据对象读取配置"
#: builtin/config.c:131
msgid "Action"
msgstr "操作"
#: builtin/config.c:132
msgid "get value: name [value-regex]"
msgstr "获取值name [value-regex]"
#: builtin/config.c:133
msgid "get all values: key [value-regex]"
msgstr "获得所有的值key [value-regex]"
#: builtin/config.c:134
msgid "get values for regexp: name-regex [value-regex]"
msgstr "根据正则表达式获得值name-regex [value-regex]"
#: builtin/config.c:135
msgid "get value specific for the URL: section[.var] URL"
msgstr "获得 URL 取值section[.var] URL"
#: builtin/config.c:136
msgid "replace all matching variables: name value [value_regex]"
msgstr "替换所有匹配的变量name value [value_regex]"
#: builtin/config.c:137
msgid "add a new variable: name value"
msgstr "添加一个新的变量name value"
#: builtin/config.c:138
msgid "remove a variable: name [value-regex]"
msgstr "删除一个变量name [value-regex]"
#: builtin/config.c:139
msgid "remove all matches: name [value-regex]"
msgstr "删除所有匹配项name [value-regex]"
#: builtin/config.c:140
msgid "rename section: old-name new-name"
msgstr "重命名小节old-name new-name"
#: builtin/config.c:141
msgid "remove a section: name"
msgstr "删除一个小节name"
#: builtin/config.c:142
msgid "list all"
msgstr "列出所有"
#: builtin/config.c:143
msgid "open an editor"
msgstr "打开一个编辑器"
#: builtin/config.c:144
msgid "find the color configured: slot [default]"
msgstr "获得配置的颜色:配置 [默认]"
#: builtin/config.c:145
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "获得颜色设置:配置 [stdout-is-tty]"
#: builtin/config.c:146
msgid "Type"
msgstr "类型"
#: builtin/config.c:147 builtin/env--helper.c:38
msgid "value is given this type"
msgstr "取值为该类型"
#: builtin/config.c:148
msgid "value is \"true\" or \"false\""
msgstr "值是 \"true\" 或 \"false\""
#: builtin/config.c:149
msgid "value is decimal number"
msgstr "值是十进制数"
#: builtin/config.c:150
msgid "value is --bool or --int"
msgstr "值是 --bool or --int"
#: builtin/config.c:151
msgid "value is a path (file or directory name)"
msgstr "值是一个路径(文件或目录名)"
#: builtin/config.c:152
msgid "value is an expiry date"
msgstr "值是一个到期日期"
#: builtin/config.c:153
msgid "Other"
msgstr "其它"
#: builtin/config.c:154
msgid "terminate values with NUL byte"
msgstr "终止值是 NUL 字节"
#: builtin/config.c:155
msgid "show variable names only"
msgstr "只显示变量名"
#: builtin/config.c:156
msgid "respect include directives on lookup"
msgstr "查询时参照 include 指令递归查找"
#: builtin/config.c:157
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
#: builtin/config.c:158 builtin/env--helper.c:40
msgid "value"
msgstr "取值"
#: builtin/config.c:158
msgid "with --get, use default value when missing entry"
msgstr "使用 --get 参数,当缺少设置时使用默认值"
#: builtin/config.c:172
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "错误的参数个数,应该为 %d 个"
#: builtin/config.c:174
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "错误的参数个数,应该为从 %d 个到 %d 个"
#: builtin/config.c:308
#, c-format
msgid "invalid key pattern: %s"
msgstr "无效键名模式:%s"
#: builtin/config.c:344
#, c-format
msgid "failed to format default config value: %s"
msgstr "格式化默认配置值失败:%s"
#: builtin/config.c:401
#, c-format
msgid "cannot parse color '%s'"
msgstr "无法解析颜色 '%s'"
#: builtin/config.c:443
msgid "unable to parse default color value"
msgstr "无法解析默认颜色值"
#: builtin/config.c:496 builtin/config.c:742
msgid "not in a git directory"
msgstr "不在 git 仓库中"
#: builtin/config.c:499
msgid "writing to stdin is not supported"
msgstr "不支持写到标准输入"
#: builtin/config.c:502
msgid "writing config blobs is not supported"
msgstr "不支持写到配置数据对象"
#: builtin/config.c:587
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
"[user]\n"
"# Please adapt and uncomment the following lines:\n"
"#\tname = %s\n"
"#\temail = %s\n"
msgstr ""
"# This is Git's per-user configuration file.\n"
"[user]\n"
"# Please adapt and uncomment the following lines:\n"
"#\tname = %s\n"
"#\temail = %s\n"
#: builtin/config.c:611
msgid "only one config file at a time"
msgstr "一次只能有一个配置文件"
#: builtin/config.c:616
msgid "--local can only be used inside a git repository"
msgstr "--local 只能在一个仓库内使用"
#: builtin/config.c:619
msgid "--blob can only be used inside a git repository"
msgstr "--blob 只能在一个仓库内使用"
#: builtin/config.c:638
msgid "$HOME not set"
msgstr "$HOME 未设置"
#: builtin/config.c:658
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
"section in \"git help worktree\" for details"
msgstr ""
"不能和多个工作区一起使用 --worktree除非启用 worktreeConfig 配置扩展。\n"
"详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
#: builtin/config.c:688
msgid "--get-color and variable type are incoherent"
msgstr "--get-color 和变量类型不兼容"
#: builtin/config.c:693
msgid "only one action at a time"
msgstr "一次只能有一个动作"
#: builtin/config.c:706
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only 仅适用于 --list 或 --get-regexp"
#: builtin/config.c:712
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
#: builtin/config.c:718
msgid "--default is only applicable to --get"
msgstr "--default 仅适用于 --get"
#: builtin/config.c:731
#, c-format
msgid "unable to read config file '%s'"
msgstr "无法读取配置文件 '%s'"
#: builtin/config.c:734
msgid "error processing config file(s)"
msgstr "处理配置文件出错"
#: builtin/config.c:744
msgid "editing stdin is not supported"
msgstr "不支持编辑标准输入"
#: builtin/config.c:746
msgid "editing blobs is not supported"
msgstr "不支持编辑数据对象"
#: builtin/config.c:760
#, c-format
msgid "cannot create configuration file %s"
msgstr "不能创建配置文件 %s"
#: builtin/config.c:773
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
" Use a regexp, --add or --replace-all to change %s."
msgstr ""
"无法用一个值覆盖多个值\n"
" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
#: builtin/config.c:847 builtin/config.c:858
#, c-format
msgid "no such section: %s"
msgstr "无此小节:%s"
#: builtin/count-objects.c:90
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
#: builtin/count-objects.c:100
msgid "print sizes in human readable format"
msgstr "以用户可读的格式显示大小"
#: builtin/describe.c:27
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<选项>] [<提交号>...]"
#: builtin/describe.c:28
msgid "git describe [<options>] --dirty"
msgstr "git describe [<选项>] --dirty"
#: builtin/describe.c:63
msgid "head"
msgstr "头"
#: builtin/describe.c:63
msgid "lightweight"
msgstr "轻量级的"
#: builtin/describe.c:63
msgid "annotated"
msgstr "附注的"
#: builtin/describe.c:273
#, c-format
msgid "annotated tag %s not available"
msgstr "附注标签 %s 无效"
#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "附注标签 %s 没有嵌入名称"
#: builtin/describe.c:279
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "标签 '%s' 的确是在 '%s'"
#: builtin/describe.c:323
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "没有标签准确匹配 '%s'"
#: builtin/describe.c:325
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr "没有精确匹配到引用或标签,继续搜索进行描述\n"
#: builtin/describe.c:379
#, c-format
msgid "finished search at %s\n"
msgstr "完成搜索 %s\n"
#: builtin/describe.c:405
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
"没有附注标签能描述 '%s'。\n"
"然而,存在未附注标签:尝试 --tags。"
#: builtin/describe.c:409
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
"没有标签能描述 '%s'。\n"
"尝试 --always或者创建一些标签。"
#: builtin/describe.c:439
#, c-format
msgid "traversed %lu commits\n"
msgstr "已遍历 %lu 个提交\n"
#: builtin/describe.c:442
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
"发现多于 %i 个标签,列出最近的 %i 个\n"
"在 %s 放弃搜索\n"
#: builtin/describe.c:510
#, c-format
msgid "describe %s\n"
msgstr "描述 %s\n"
#: builtin/describe.c:513
#, c-format
msgid "Not a valid object name %s"
msgstr "不是一个有效的对象名 %s"
#: builtin/describe.c:521
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s 既不是提交也不是数据对象"
#: builtin/describe.c:535
msgid "find the tag that comes after the commit"
msgstr "寻找该提交之后的标签"
#: builtin/describe.c:536
msgid "debug search strategy on stderr"
msgstr "在标准错误上调试搜索策略"
#: builtin/describe.c:537
msgid "use any ref"
msgstr "使用任意引用"
#: builtin/describe.c:538
msgid "use any tag, even unannotated"
msgstr "使用任意标签,即使未附带注释"
#: builtin/describe.c:539
msgid "always use long format"
msgstr "始终使用长提交号格式"
#: builtin/describe.c:540
msgid "only follow first parent"
msgstr "只跟随第一个父提交"
#: builtin/describe.c:543
msgid "only output exact matches"
msgstr "只输出精确匹配"
#: builtin/describe.c:545
msgid "consider <n> most recent tags (default: 10)"
msgstr "考虑最近 <n> 个标签默认10"
#: builtin/describe.c:547
msgid "only consider tags matching <pattern>"
msgstr "只考虑匹配 <模式> 的标签"
#: builtin/describe.c:549
msgid "do not consider tags matching <pattern>"
msgstr "不考虑匹配 <模式> 的标签"
#: builtin/describe.c:551 builtin/name-rev.c:422
msgid "show abbreviated commit object as fallback"
msgstr "显示简写的提交号作为后备"
#: builtin/describe.c:552 builtin/describe.c:555
msgid "mark"
msgstr "标记"
#: builtin/describe.c:553
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\""
#: builtin/describe.c:556
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "对于损坏的工作区,追加 <标记>(默认:\"-broken\""
#: builtin/describe.c:574
msgid "--long is incompatible with --abbrev=0"
msgstr "--long 与 --abbrev=0 不兼容"
#: builtin/describe.c:603
msgid "No names found, cannot describe anything."
msgstr "没有发现名称,无法描述任何东西。"
#: builtin/describe.c:654
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty 与提交号不兼容"
#: builtin/describe.c:656
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken 与提交号不兼容"
#: builtin/diff.c:84
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "'%s':不是一个正规文件或符号链接"
#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr "无效选项:%s"
#: builtin/diff.c:350
msgid "Not a git repository"
msgstr "不是一个 git 仓库"
#: builtin/diff.c:394
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了无效对象 '%s'。"
#: builtin/diff.c:403
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "提供了超过两个数据对象:'%s'"
#: builtin/diff.c:408
#, c-format
msgid "unhandled object '%s' given."
msgstr "无法处理的对象 '%s'。"
#: builtin/difftool.c:30
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
#: builtin/difftool.c:253
#, c-format
msgid "failed: %d"
msgstr "失败:%d"
#: builtin/difftool.c:295
#, c-format
msgid "could not read symlink %s"
msgstr "无法读取符号链接 %s"
#: builtin/difftool.c:297
#, c-format
msgid "could not read symlink file %s"
msgstr "无法读取符号链接文件 %s"
#: builtin/difftool.c:305
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
#: builtin/difftool.c:406
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
msgstr ""
"不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--"
"cc')。"
#: builtin/difftool.c:626
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "两个文件都被修改:'%s' 和 '%s'。"
#: builtin/difftool.c:628
msgid "working tree file has been left."
msgstr "工作区文件被留了下来。"
#: builtin/difftool.c:639
#, c-format
msgid "temporary files exist in '%s'."
msgstr "临时文件存在于 '%s'。"
#: builtin/difftool.c:640
msgid "you may want to cleanup or recover these."
msgstr "您可能想要清理或者恢复它们。"
#: builtin/difftool.c:689
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "使用 `diff.guitool` 代替 `diff.tool`"
#: builtin/difftool.c:691
msgid "perform a full-directory diff"
msgstr "执行一个全目录差异比较"
#: builtin/difftool.c:693
msgid "do not prompt before launching a diff tool"
msgstr "启动差异比较工具之前不提示"
#: builtin/difftool.c:698
msgid "use symlinks in dir-diff mode"
msgstr "在 dir-diff 模式中使用符号链接"
#: builtin/difftool.c:699
msgid "tool"
msgstr "工具"
#: builtin/difftool.c:700
msgid "use the specified diff tool"
msgstr "使用指定的差异比较工具"
#: builtin/difftool.c:702
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
#: builtin/difftool.c:705
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出"
#: builtin/difftool.c:708
msgid "specify a custom command for viewing diffs"
msgstr "指定一个用于查看差异的自定义命令"
#: builtin/difftool.c:709
msgid "passed to `diff`"
msgstr "传递给 `diff`"
#: builtin/difftool.c:724
msgid "difftool requires worktree or --no-index"
msgstr "difftool 要求工作区或者 --no-index"
#: builtin/difftool.c:731
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff 和 --no-index 不兼容"
#: builtin/difftool.c:734
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui、--tool 和 --extcmd 互斥"
#: builtin/difftool.c:742
msgid "no <tool> given for --tool=<tool>"
msgstr "没有为 --tool=<工具> 参数提供 <工具>"
#: builtin/difftool.c:749
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
#: builtin/env--helper.c:6
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>"
#: builtin/env--helper.c:37 builtin/hash-object.c:98
msgid "type"
msgstr "类型"
#: builtin/env--helper.c:41
msgid "default for git_env_*(...) to fall back on"
msgstr "git_env_*(...) 的默认值"
#: builtin/env--helper.c:43
msgid "be quiet only use git_env_*() value as exit code"
msgstr "安静模式,只使用 git_env_*() 的值作为退出码"
#: builtin/env--helper.c:62
#, c-format
msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
msgstr "选项 `--default' 和 `type=bool` 期望一个布尔值,不是 `%s`"
#: builtin/env--helper.c:77
#, c-format
msgid ""
"option `--default' expects an unsigned long value with `--type=ulong`, not `"
"%s`"
msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型,不是 `%s`"
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
#: builtin/fast-export.c:1124
msgid "show progress after <n> objects"
msgstr "在 <n> 个对象之后显示进度"
#: builtin/fast-export.c:1126
msgid "select handling of signed tags"
msgstr "选择如何处理签名标签"
#: builtin/fast-export.c:1129
msgid "select handling of tags that tag filtered objects"
msgstr "选择当标签指向被过滤对象时该标签的处理方式"
#: builtin/fast-export.c:1132
msgid "select handling of commit messages in an alternate encoding"
msgstr "选择使用备用编码处理提交说明"
#: builtin/fast-export.c:1135
msgid "Dump marks to this file"
msgstr "把标记存储到这个文件"
#: builtin/fast-export.c:1137
msgid "Import marks from this file"
msgstr "从这个文件导入标记"
#: builtin/fast-export.c:1139
msgid "Fake a tagger when tags lack one"
msgstr "当标签缺少标记者字段时,假装提供一个"
#: builtin/fast-export.c:1141
msgid "Output full tree for each commit"
msgstr "每次提交都输出整个树"
#: builtin/fast-export.c:1143
msgid "Use the done feature to terminate the stream"
msgstr "使用 done 功能来终止流"
#: builtin/fast-export.c:1144
msgid "Skip output of blob data"
msgstr "跳过数据对象的输出"
#: builtin/fast-export.c:1145 builtin/log.c:1632
msgid "refspec"
msgstr "引用规格"
#: builtin/fast-export.c:1146
msgid "Apply refspec to exported refs"
msgstr "对导出的引用应用引用规格"
#: builtin/fast-export.c:1147
msgid "anonymize output"
msgstr "匿名输出"
#: builtin/fast-export.c:1149
msgid "Reference parents which are not in fast-export stream by object id"
msgstr "引用父对象 ID 不在 fast-export 流中"
#: builtin/fast-export.c:1151
msgid "Show original object ids of blobs/commits"
msgstr "显示数据对象/提交的原始对象 ID"
#: builtin/fetch.c:30
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
#: builtin/fetch.c:31
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<选项>] <组>"
#: builtin/fetch.c:32
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
#: builtin/fetch.c:33
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<选项>]"
#: builtin/fetch.c:125 builtin/pull.c:203
msgid "fetch from all remotes"
msgstr "从所有的远程抓取"
#: builtin/fetch.c:127 builtin/pull.c:206
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
#: builtin/fetch.c:129 builtin/pull.c:209
msgid "path to upload pack on remote end"
msgstr "上传包到远程的路径"
#: builtin/fetch.c:130
msgid "force overwrite of local reference"
msgstr "强制覆盖本地引用"
#: builtin/fetch.c:132
msgid "fetch from multiple remotes"
msgstr "从多个远程抓取"
#: builtin/fetch.c:134 builtin/pull.c:213
msgid "fetch all tags and associated objects"
msgstr "抓取所有的标签和关联对象"
#: builtin/fetch.c:136
msgid "do not fetch all tags (--no-tags)"
msgstr "不抓取任何标签(--no-tags)"
#: builtin/fetch.c:138
msgid "number of submodules fetched in parallel"
msgstr "子模组获取的并发数"
#: builtin/fetch.c:140 builtin/pull.c:216
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除远程已经不存在的分支的跟踪分支"
#: builtin/fetch.c:142
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "清除远程不存在的本地标签,并且替换变更标签"
# 译者:可选值,不能翻译
#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
msgid "on-demand"
msgstr "on-demand"
#: builtin/fetch.c:144
msgid "control recursive fetching of submodules"
msgstr "控制子模组的递归抓取"
#: builtin/fetch.c:148 builtin/pull.c:224
msgid "keep downloaded pack"
msgstr "保持下载包"
#: builtin/fetch.c:150
msgid "allow updating of HEAD ref"
msgstr "允许更新 HEAD 引用"
#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
msgid "deepen history of shallow clone"
msgstr "深化浅克隆的历史"
#: builtin/fetch.c:155
msgid "deepen history of shallow repository based on time"
msgstr "基于时间来深化浅克隆的历史"
#: builtin/fetch.c:161 builtin/pull.c:230
msgid "convert to a complete repository"
msgstr "转换为一个完整的仓库"
#: builtin/fetch.c:164
msgid "prepend this to submodule path output"
msgstr "在子模组路径输出的前面加上此目录"
#: builtin/fetch.c:167
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "递归获取子模组的缺省值(比配置文件优先级低)"
#: builtin/fetch.c:171 builtin/pull.c:233
msgid "accept refs that update .git/shallow"
msgstr "接受更新 .git/shallow 的引用"
#: builtin/fetch.c:172 builtin/pull.c:235
msgid "refmap"
msgstr "引用映射"
#: builtin/fetch.c:173 builtin/pull.c:236
msgid "specify fetch refmap"
msgstr "指定获取操作的引用映射"
#: builtin/fetch.c:180
msgid "report that we have only objects reachable from this object"
msgstr "报告我们只拥有从该对象开始可达的对象"
#: builtin/fetch.c:183
msgid "run 'gc --auto' after fetching"
msgstr "获取后执行 'gc --auto'"
#: builtin/fetch.c:185 builtin/pull.c:245
msgid "check for forced-updates on all updated branches"
msgstr "在所有更新分支上检查强制更新"
#: builtin/fetch.c:491
msgid "Couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用"
#: builtin/fetch.c:630
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "配置变量 fetch.output 包含无效值 %s"
#: builtin/fetch.c:728
#, c-format
msgid "object %s not found"
msgstr "对象 %s 未发现"
#: builtin/fetch.c:732
msgid "[up to date]"
msgstr "[最新]"
#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
msgid "[rejected]"
msgstr "[已拒绝]"
#: builtin/fetch.c:746
msgid "can't fetch in current branch"
msgstr "当前分支下不能执行获取操作"
#: builtin/fetch.c:756
msgid "[tag update]"
msgstr "[标签更新]"
#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
#: builtin/fetch.c:828
msgid "unable to update local ref"
msgstr "不能更新本地引用"
#: builtin/fetch.c:761
msgid "would clobber existing tag"
msgstr "会破坏现有的标签"
#: builtin/fetch.c:783
msgid "[new tag]"
msgstr "[新标签]"
#: builtin/fetch.c:786
msgid "[new branch]"
msgstr "[新分支]"
#: builtin/fetch.c:789
msgid "[new ref]"
msgstr "[新引用]"
#: builtin/fetch.c:828
msgid "forced update"
msgstr "强制更新"
#: builtin/fetch.c:833
msgid "non-fast-forward"
msgstr "非快进"
#: builtin/fetch.c:854
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
"flag or run 'git config fetch.showForcedUpdates true'."
msgstr ""
"获取操作通常显示哪些分支发生了强制更新,但该检查已被禁用。\n"
"要重新启用,请使用 '--show-forced-updates' 选项或运行\n"
"'git config fetch.showForcedUpdates true'。"
#: builtin/fetch.c:858
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
"false'\n"
" to avoid this check.\n"
msgstr ""
"花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n"
"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n"
#: builtin/fetch.c:888
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必需的对象\n"
#: builtin/fetch.c:909
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "拒绝 %s 因为浅克隆不允许被更新"
#: builtin/fetch.c:1000 builtin/fetch.c:1131
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"
#: builtin/fetch.c:1011
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
"一些本地引用不能被更新;尝试运行\n"
" 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者:注意保持前导空格
#: builtin/fetch.c:1101
#, c-format
msgid " (%s will become dangling)"
msgstr " %s 将成为悬空状态)"
# 译者:注意保持前导空格
#: builtin/fetch.c:1102
#, c-format
msgid " (%s has become dangling)"
msgstr " %s 已成为悬空状态)"
#: builtin/fetch.c:1134
msgid "[deleted]"
msgstr "[已删除]"
#: builtin/fetch.c:1135 builtin/remote.c:1036
msgid "(none)"
msgstr "(无)"
#: builtin/fetch.c:1158
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒绝获取到非纯仓库的当前分支 %s"
#: builtin/fetch.c:1177
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
#: builtin/fetch.c:1180
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
#: builtin/fetch.c:1484
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"
#: builtin/fetch.c:1486 builtin/remote.c:100
#, c-format
msgid "Could not fetch %s"
msgstr "不能获取 %s"
#: builtin/fetch.c:1532
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialClone"
msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
#: builtin/fetch.c:1556
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
#: builtin/fetch.c:1593
msgid "You need to specify a tag name."
msgstr "您需要指定一个标签名称。"
#: builtin/fetch.c:1644
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen 不支持负数深度"
#: builtin/fetch.c:1646
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen 和 --depth 是互斥的"
#: builtin/fetch.c:1651
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 和 --unshallow 不能同时使用"
#: builtin/fetch.c:1653
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
#: builtin/fetch.c:1669
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个仓库参数"
#: builtin/fetch.c:1671
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何意义"
#: builtin/fetch.c:1680
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组:%s"
#: builtin/fetch.c:1687
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用规格没有意义"
#: builtin/fetch.c:1703
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库"
#: builtin/fmt-merge-msg.c:18
msgid ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
#: builtin/fmt-merge-msg.c:672
msgid "populate log with at most <n> entries from shortlog"
msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
#: builtin/fmt-merge-msg.c:675
msgid "alias for --log (deprecated)"
msgstr "参数 --log 的别名(已弃用)"
#: builtin/fmt-merge-msg.c:678
msgid "text"
msgstr "文本"
#: builtin/fmt-merge-msg.c:679
msgid "use <text> as start of message"
msgstr "使用 <文本> 作为提交说明的开始"
#: builtin/fmt-merge-msg.c:680
msgid "file to read from"
msgstr "从文件中读取"
#: builtin/for-each-ref.c:10
msgid "git for-each-ref [<options>] [<pattern>]"
msgstr "git for-each-ref [<选项>] [<模式>]"
#: builtin/for-each-ref.c:11
msgid "git for-each-ref [--points-at <object>]"
msgstr "git for-each-ref [--points-at <对象>]"
#: builtin/for-each-ref.c:12
msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]"
#: builtin/for-each-ref.c:13
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
#: builtin/for-each-ref.c:28
msgid "quote placeholders suitably for shells"
msgstr "引用占位符适用于 shells"
#: builtin/for-each-ref.c:30
msgid "quote placeholders suitably for perl"
msgstr "引用占位符适用于 perl"
#: builtin/for-each-ref.c:32
msgid "quote placeholders suitably for python"
msgstr "引用占位符适用于 python"
#: builtin/for-each-ref.c:34
msgid "quote placeholders suitably for Tcl"
msgstr "引用占位符适用于 Tcl"
#: builtin/for-each-ref.c:37
msgid "show only <n> matched refs"
msgstr "只显示 <n> 个匹配的引用"
#: builtin/for-each-ref.c:39 builtin/tag.c:439
msgid "respect format colors"
msgstr "遵照格式中的颜色输出"
#: builtin/for-each-ref.c:42
msgid "print only refs which points at the given object"
msgstr "只打印指向给定对象的引用"
#: builtin/for-each-ref.c:44
msgid "print only refs that are merged"
msgstr "只打印已经合并的引用"
#: builtin/for-each-ref.c:45
msgid "print only refs that are not merged"
msgstr "只打印没有合并的引用"
#: builtin/for-each-ref.c:46
msgid "print only refs which contain the commit"
msgstr "只打印包含该提交的引用"
#: builtin/for-each-ref.c:47
msgid "print only refs which don't contain the commit"
msgstr "只打印不包含该提交的引用"
#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
msgid "unknown"
msgstr "未知"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
#: builtin/fsck.c:120 builtin/fsck.c:136
#, c-format
msgid "error in %s %s: %s"
msgstr "%s %s 错误:%s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
#: builtin/fsck.c:131
#, c-format
msgid "warning in %s %s: %s"
msgstr "%s %s 警告:%s"
#: builtin/fsck.c:157 builtin/fsck.c:159
#, c-format
msgid "broken link from %7s %s"
msgstr "来自 %7s %s 的损坏的链接"
#: builtin/fsck.c:168
msgid "wrong object type in link"
msgstr "链接中错误的对象类型"
#: builtin/fsck.c:184
#, c-format
msgid ""
"broken link from %7s %s\n"
" to %7s %s"
msgstr ""
"损坏的链接来自于 %7s %s\n"
" 到 %7s %s"
#: builtin/fsck.c:295
#, c-format
msgid "missing %s %s"
msgstr "缺失 %s %s"
#: builtin/fsck.c:321
#, c-format
msgid "unreachable %s %s"
msgstr "不可达 %s %s"
#: builtin/fsck.c:340
#, c-format
msgid "dangling %s %s"
msgstr "悬空 %s %s"
#: builtin/fsck.c:349
msgid "could not create lost-found"
msgstr "不能创建 lost-found"
#: builtin/fsck.c:360
#, c-format
msgid "could not finish '%s'"
msgstr "不能完成 '%s'"
#: builtin/fsck.c:377
#, c-format
msgid "Checking %s"
msgstr "正在检查 %s"
#: builtin/fsck.c:415
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "正在检查连通性(%d 个对象)"
#: builtin/fsck.c:434
#, c-format
msgid "Checking %s %s"
msgstr "正在检查 %s %s"
#: builtin/fsck.c:438
msgid "broken links"
msgstr "损坏的链接"
#: builtin/fsck.c:447
#, c-format
msgid "root %s"
msgstr "根 %s"
#: builtin/fsck.c:455
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr "标记 %s %s (%s) 于 %s"
#: builtin/fsck.c:484
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s对象损坏或丢失"
#: builtin/fsck.c:509
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s无效的引用日志条目 %s"
#: builtin/fsck.c:523
#, c-format
msgid "Checking reflog %s->%s"
msgstr "正在检查引用日志 %s->%s"
#: builtin/fsck.c:557
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s无效的 sha1 指针 %s"
#: builtin/fsck.c:564
#, c-format
msgid "%s: not a commit"
msgstr "%s不是一个提交"
#: builtin/fsck.c:619
msgid "notice: No default references"
msgstr "注意:无默认引用"
#: builtin/fsck.c:634
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s对象损坏或丢失%s"
#: builtin/fsck.c:647
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s不能解析对象%s"
#: builtin/fsck.c:667
#, c-format
msgid "bad sha1 file: %s"
msgstr "坏的 sha1 文件:%s"
#: builtin/fsck.c:682
msgid "Checking object directory"
msgstr "正在检查对象目录"
#: builtin/fsck.c:685
msgid "Checking object directories"
msgstr "正在检查对象目录"
#: builtin/fsck.c:700
#, c-format
msgid "Checking %s link"
msgstr "正在检查 %s 链接"
#: builtin/fsck.c:705 builtin/index-pack.c:842
#, c-format
msgid "invalid %s"
msgstr "无效的 %s"
#: builtin/fsck.c:712
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s 指向奇怪的东西(%s"
#: builtin/fsck.c:718
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s分离头指针的指向不存在"
#: builtin/fsck.c:722
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "注意:%s 指向一个尚未诞生的分支(%s"
#: builtin/fsck.c:734
msgid "Checking cache tree"
msgstr "正在检查缓存树"
#: builtin/fsck.c:739
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%scache-tree 中无效的 sha1 指针"
#: builtin/fsck.c:750
msgid "non-tree in cache-tree"
msgstr "cache-tree 中非树对象"
#: builtin/fsck.c:781
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<选项>] [<对象>...]"
#: builtin/fsck.c:787
msgid "show unreachable objects"
msgstr "显示不可达的对象"
#: builtin/fsck.c:788
msgid "show dangling objects"
msgstr "显示悬空的对象"
#: builtin/fsck.c:789
msgid "report tags"
msgstr "报告标签"
#: builtin/fsck.c:790
msgid "report root nodes"
msgstr "报告根节点"
#: builtin/fsck.c:791
msgid "make index objects head nodes"
msgstr "将索引亦作为检查的头节点"
#: builtin/fsck.c:792
msgid "make reflogs head nodes (default)"
msgstr "将引用日志作为检查的头节点(默认)"
#: builtin/fsck.c:793
msgid "also consider packs and alternate objects"
msgstr "也考虑包和备用对象"
#: builtin/fsck.c:794
msgid "check only connectivity"
msgstr "仅检查连通性"
#: builtin/fsck.c:795
msgid "enable more strict checking"
msgstr "启用更严格的检查"
#: builtin/fsck.c:797
msgid "write dangling objects in .git/lost-found"
msgstr "将悬空对象写入 .git/lost-found 中"
#: builtin/fsck.c:798 builtin/prune.c:132
msgid "show progress"
msgstr "显示进度"
#: builtin/fsck.c:799
msgid "show verbose names for reachable objects"
msgstr "显示可达对象的详细名称"
#: builtin/fsck.c:859 builtin/index-pack.c:225
msgid "Checking objects"
msgstr "正在检查对象"
#: builtin/fsck.c:887
#, c-format
msgid "%s: object missing"
msgstr "%s对象缺失"
#: builtin/fsck.c:899
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "无效的参数:期望 sha1得到 '%s'"
#: builtin/gc.c:34
msgid "git gc [<options>]"
msgstr "git gc [<选项>]"
#: builtin/gc.c:90
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "对 %s 调用 fstat 失败:%s"
#: builtin/gc.c:126
#, c-format
msgid "failed to parse '%s' value '%s'"
msgstr "无法解析 '%s' 值 '%s'"
#: builtin/gc.c:476 builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
msgstr "不能对 '%s' 调用 stat"
#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
#, c-format
msgid "cannot read '%s'"
msgstr "不能读取 '%s'"
#: builtin/gc.c:492
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
"and remove %s.\n"
"Automatic cleanup will not be performed until the file is removed.\n"
"\n"
"%s"
msgstr ""
"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"
"在该文件被删除之前,自动清理将不会执行。\n"
"\n"
"%s"
#: builtin/gc.c:540
msgid "prune unreferenced objects"
msgstr "清除未引用的对象"
#: builtin/gc.c:542
msgid "be more thorough (increased runtime)"
msgstr "更彻底(增加运行时间)"
#: builtin/gc.c:543
msgid "enable auto-gc mode"
msgstr "启用自动垃圾回收模式"
#: builtin/gc.c:546
msgid "force running gc even if there may be another gc running"
msgstr "强制执行 gc 即使另外一个 gc 正在执行"
#: builtin/gc.c:549
msgid "repack all other packs except the largest pack"
msgstr "除了最大的包之外,对所有其它包文件重新打包"
#: builtin/gc.c:566
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "解析 gc.logexpiry 的值 %s 失败"
#: builtin/gc.c:577
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "解析清除期限值 %s 失败"
#: builtin/gc.c:597
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "自动在后台执行仓库打包以求最佳性能。\n"
#: builtin/gc.c:599
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自动打包仓库以求最佳性能。\n"
#: builtin/gc.c:600
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "手工维护参见 \"git help gc\"。\n"
#: builtin/gc.c:640
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>(如果不是,使用 --force"
#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
#: builtin/grep.c:29
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
#: builtin/grep.c:225
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep无法创建线程%s"
#: builtin/grep.c:279
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
#. TRANSLATORS: %s is the configuration
#. variable for tweaking threads, currently
#. grep.threads
#.
#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
#: builtin/pack-objects.c:2728
#, c-format
msgid "no threads support, ignoring %s"
msgstr "没有线程支持,忽略 %s"
#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
#, c-format
msgid "unable to read tree (%s)"
msgstr "无法读取树(%s"
#: builtin/grep.c:648
#, c-format
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"
#: builtin/grep.c:714
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"
#: builtin/grep.c:813
msgid "search in index instead of in the work tree"
msgstr "在索引区搜索而不是在工作区"
#: builtin/grep.c:815
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的内容中查找"
# 译者:中文字符串拼接,可删除前导空格
#: builtin/grep.c:817
msgid "search in both tracked and untracked files"
msgstr "在跟踪和未跟踪的文件中搜索"
#: builtin/grep.c:819
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的文件"
#: builtin/grep.c:821
msgid "recursively search in each submodule"
msgstr "在每一个子模组中递归搜索"
#: builtin/grep.c:824
msgid "show non-matching lines"
msgstr "显示未匹配的行"
#: builtin/grep.c:826
msgid "case insensitive matching"
msgstr "不区分大小写匹配"
#: builtin/grep.c:828
msgid "match patterns only at word boundaries"
msgstr "只在单词边界匹配模式"
#: builtin/grep.c:830
msgid "process binary files as text"
msgstr "把二进制文件当做文本处理"
#: builtin/grep.c:832
msgid "don't match patterns in binary files"
msgstr "不在二进制文件中匹配模式"
#: builtin/grep.c:835
msgid "process binary files with textconv filters"
msgstr "用 textconv 过滤器处理二进制文件"
#: builtin/grep.c:837
msgid "search in subdirectories (default)"
msgstr "在子目录中寻找(默认)"
#: builtin/grep.c:839
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下寻找"
#: builtin/grep.c:843
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达式"
#: builtin/grep.c:846
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达式(默认)"
#: builtin/grep.c:849
msgid "interpret patterns as fixed strings"
msgstr "把模式解析为固定的字符串"
#: builtin/grep.c:852
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达式"
#: builtin/grep.c:855
msgid "show line numbers"
msgstr "显示行号"
#: builtin/grep.c:856
msgid "show column number of first match"
msgstr "显示第一个匹配的列号"
#: builtin/grep.c:857
msgid "don't show filenames"
msgstr "不显示文件名"
#: builtin/grep.c:858
msgid "show filenames"
msgstr "显示文件名"
#: builtin/grep.c:860
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件名"
#: builtin/grep.c:862
msgid "show only filenames instead of matching lines"
msgstr "只显示文件名而不显示匹配的行"
#: builtin/grep.c:864
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同义"
#: builtin/grep.c:867
msgid "show only the names of files without match"
msgstr "只显示未匹配的文件名"
#: builtin/grep.c:869
msgid "print NUL after filenames"
msgstr "在文件名后输出 NUL 字符"
#: builtin/grep.c:872
msgid "show only matching parts of a line"
msgstr "只显示行中的匹配的部分"
#: builtin/grep.c:874
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹配行数,而不显示匹配的行"
#: builtin/grep.c:875
msgid "highlight matches"
msgstr "高亮显示匹配项"
#: builtin/grep.c:877
msgid "print empty line between matches from different files"
msgstr "在不同文件的匹配项之间打印空行"
#: builtin/grep.c:879
msgid "show filename only once above matches from same file"
msgstr "只在同一文件的匹配项的上面显示一次文件名"
#: builtin/grep.c:882
msgid "show <n> context lines before and after matches"
msgstr "显示匹配项前后的 <n> 行上下文"
#: builtin/grep.c:885
msgid "show <n> context lines before matches"
msgstr "显示匹配项前 <n> 行上下文"
#: builtin/grep.c:887
msgid "show <n> context lines after matches"
msgstr "显示匹配项后 <n> 行上下文"
#: builtin/grep.c:889
msgid "use <n> worker threads"
msgstr "使用 <n> 个工作线程"
#: builtin/grep.c:890
msgid "shortcut for -C NUM"
msgstr "快捷键 -C 数字"
#: builtin/grep.c:893
msgid "show a line with the function name before matches"
msgstr "在匹配的前面显示一行函数名"
#: builtin/grep.c:895
msgid "show the surrounding function"
msgstr "显示所在函数的前后内容"
#: builtin/grep.c:898
msgid "read patterns from file"
msgstr "从文件读取模式"
#: builtin/grep.c:900
msgid "match <pattern>"
msgstr "匹配 <模式>"
#: builtin/grep.c:902
msgid "combine patterns specified with -e"
msgstr "组合用 -e 参数设定的模式"
#: builtin/grep.c:914
msgid "indicate hit with exit status without output"
msgstr "不输出,而用退出码标识命中状态"
#: builtin/grep.c:916
msgid "show only matches from files that match all patterns"
msgstr "只显示匹配所有模式的文件中的匹配"
#: builtin/grep.c:918
msgid "show parse tree for grep expression"
msgstr "显示 grep 表达式的解析树"
#: builtin/grep.c:922
msgid "pager"
msgstr "分页"
#: builtin/grep.c:922
msgid "show matching files in the pager"
msgstr "分页显示匹配的文件"
#: builtin/grep.c:926
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允许调用 grep(1)(本次构建忽略)"
#: builtin/grep.c:990
msgid "no pattern given"
msgstr "未提供匹配模式"
#: builtin/grep.c:1026
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 或 --untracked 不能和版本同时使用"
#: builtin/grep.c:1034
#, c-format
msgid "unable to resolve revision: %s"
msgstr "不能解析版本:%s"
#: builtin/grep.c:1065
msgid "invalid option combination, ignoring --threads"
msgstr "无效的选项组合,忽略 --threads"
#: builtin/grep.c:1068 builtin/pack-objects.c:3416
msgid "no threads support, ignoring --threads"
msgstr "没有线程支持,忽略 --threads"
#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的线程数无效(%d"
#: builtin/grep.c:1094
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
#: builtin/grep.c:1117
msgid "option not supported with --recurse-submodules"
msgstr "选项不支持和 --recurse-submodules 共用"
#: builtin/grep.c:1123
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
#: builtin/grep.c:1129
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
#: builtin/grep.c:1137
msgid "both --cached and trees are given"
msgstr "同时给出了 --cached 和树对象"
#: builtin/hash-object.c:85
msgid ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgstr ""
"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
"[--] <文件>..."
#: builtin/hash-object.c:86
msgid "git hash-object --stdin-paths"
msgstr "git hash-object --stdin-paths"
#: builtin/hash-object.c:98
msgid "object type"
msgstr "对象类型"
#: builtin/hash-object.c:99
msgid "write the object into the object database"
msgstr "将对象写入对象数据库"
#: builtin/hash-object.c:101
msgid "read the object from stdin"
msgstr "从标准输入读取对象"
#: builtin/hash-object.c:103
msgid "store file as is without filters"
msgstr "原样存储文件不使用过滤器"
#: builtin/hash-object.c:104
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
#: builtin/hash-object.c:105
msgid "process file as it were from this path"
msgstr "处理文件并假设其来自于此路径"
#: builtin/help.c:46
msgid "print all available commands"
msgstr "打印所有可用的命令"
#: builtin/help.c:47
msgid "exclude guides"
msgstr "排除向导"
#: builtin/help.c:48
msgid "print list of useful guides"
msgstr "显示有用的指南列表"
#: builtin/help.c:49
msgid "print all configuration variable names"
msgstr "打印所有配置变量名称"
#: builtin/help.c:51
msgid "show man page"
msgstr "显示 man 手册"
#: builtin/help.c:52
msgid "show manual in web browser"
msgstr "在 web 浏览器中显示手册"
#: builtin/help.c:54
msgid "show info page"
msgstr "显示 info 手册"
#: builtin/help.c:56
msgid "print command description"
msgstr "打印命令描述"
#: builtin/help.c:61
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
#: builtin/help.c:77
#, c-format
msgid "unrecognized help format '%s'"
msgstr "未能识别的帮助格式 '%s'"
#: builtin/help.c:104
msgid "Failed to start emacsclient."
msgstr "无法启动 emacsclient。"
#: builtin/help.c:117
msgid "Failed to parse emacsclient version."
msgstr "无法解析 emacsclient 版本。"
#: builtin/help.c:125
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient 版本 '%d' 太老(< 22。"
#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
#, c-format
msgid "failed to exec '%s'"
msgstr "执行 '%s' 失败"
#: builtin/help.c:221
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
"'%s':不支持的 man 手册查看器的路径。\n"
"请使用 'man.<工具>.cmd'。"
#: builtin/help.c:233
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
"'%s': 支持的 man 手册查看器命令。\n"
"请使用 'man.<工具>.path'。"
#: builtin/help.c:350
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s':未知的 man 查看器。"
#: builtin/help.c:367
msgid "no man viewer handled the request"
msgstr "没有 man 查看器处理此请求"
#: builtin/help.c:375
msgid "no info viewer handled the request"
msgstr "没有 info 查看器处理此请求"
#: builtin/help.c:434 builtin/help.c:445 git.c:336
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' 是 '%s' 的别名"
#: builtin/help.c:448 git.c:365
#, c-format
msgid "bad alias.%s string: %s"
msgstr "坏的 alias.%s 字符串:%s"
#: builtin/help.c:477 builtin/help.c:507
#, c-format
msgid "usage: %s%s"
msgstr "用法:%s%s"
#: builtin/help.c:491
msgid "'git help config' for more information"
msgstr "'git help config' 获取更多信息"
#: builtin/index-pack.c:185
#, c-format
msgid "object type mismatch at %s"
msgstr "%s 的对象类型不匹配"
#: builtin/index-pack.c:205
#, c-format
msgid "did not receive expected object %s"
msgstr "未能获取预期的对象 %s"
#: builtin/index-pack.c:208
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "对象 %s应为类型 %s却是 %s"
#: builtin/index-pack.c:258
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "无法填充 %d 字节"
msgstr[1] "无法填充 %d 字节"
#: builtin/index-pack.c:268
msgid "early EOF"
msgstr "过早的文件结束符EOF"
#: builtin/index-pack.c:269
msgid "read error on input"
msgstr "输入上的读错误"
#: builtin/index-pack.c:281
msgid "used more bytes than were available"
msgstr "用掉了超过可用的字节"
#: builtin/index-pack.c:288 builtin/pack-objects.c:604
msgid "pack too large for current definition of off_t"
msgstr "包太大超过了当前 off_t 的定义"
#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
msgid "pack exceeds maximum allowed size"
msgstr "包超过了最大允许值"
#: builtin/index-pack.c:312
#, c-format
msgid "cannot open packfile '%s'"
msgstr "无法打开包文件 '%s'"
#: builtin/index-pack.c:326
msgid "pack signature mismatch"
msgstr "包签名不匹配"
#: builtin/index-pack.c:328
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "不支持包版本 %<PRIu32>"
#: builtin/index-pack.c:346
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>%s"
#: builtin/index-pack.c:466
#, c-format
msgid "inflate returned %d"
msgstr "解压缩返回 %d"
#: builtin/index-pack.c:515
msgid "offset value overflow for delta base object"
msgstr "偏移值覆盖了 delta 基准对象"
#: builtin/index-pack.c:523
msgid "delta base offset is out of bound"
msgstr "delta 基准偏移越界"
#: builtin/index-pack.c:531
#, c-format
msgid "unknown object type %d"
msgstr "未知对象类型 %d"
#: builtin/index-pack.c:562
msgid "cannot pread pack file"
msgstr "无法读取包文件"
#: builtin/index-pack.c:564
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
#: builtin/index-pack.c:590
msgid "serious inflate inconsistency"
msgstr "解压缩严重的不一致"
#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
#: builtin/index-pack.c:803 builtin/index-pack.c:812
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "发现 %s 出现 SHA1 冲突!"
#: builtin/index-pack.c:738 builtin/pack-objects.c:157
#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
#, c-format
msgid "unable to read %s"
msgstr "不能读 %s"
#: builtin/index-pack.c:801
#, c-format
msgid "cannot read existing object info %s"
msgstr "不能读取现存对象信息 %s"
#: builtin/index-pack.c:809
#, c-format
msgid "cannot read existing object %s"
msgstr "不能读取现存对象 %s"
#: builtin/index-pack.c:823
#, c-format
msgid "invalid blob object %s"
msgstr "无效的数据对象 %s"
#: builtin/index-pack.c:826 builtin/index-pack.c:845
msgid "fsck error in packed object"
msgstr "对打包对象 fsck 检查出错"
#: builtin/index-pack.c:847
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子对象并非都可达"
#: builtin/index-pack.c:919 builtin/index-pack.c:950
msgid "failed to apply delta"
msgstr "应用 delta 失败"
#: builtin/index-pack.c:1118
msgid "Receiving objects"
msgstr "接收对象中"
#: builtin/index-pack.c:1118
msgid "Indexing objects"
msgstr "索引对象中"
#: builtin/index-pack.c:1152
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包冲突SHA1 不匹配)"
#: builtin/index-pack.c:1157
msgid "cannot fstat packfile"
msgstr "不能对包文件调用 fstat"
#: builtin/index-pack.c:1160
msgid "pack has junk at the end"
msgstr "包的结尾有垃圾数据"
#: builtin/index-pack.c:1172
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中遇到不可理喻的问题"
#: builtin/index-pack.c:1195
msgid "Resolving deltas"
msgstr "处理 delta 中"
#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
#, c-format
msgid "unable to create thread: %s"
msgstr "不能创建线程:%s"
#: builtin/index-pack.c:1246
msgid "confusion beyond insanity"
msgstr "不可理喻"
#: builtin/index-pack.c:1252
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "完成 %d 个本地对象"
msgstr[1] "完成 %d 个本地对象"
#: builtin/index-pack.c:1264
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
#: builtin/index-pack.c:1268
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "包有 %d 个未解决的 delta"
msgstr[1] "包有 %d 个未解决的 delta"
#: builtin/index-pack.c:1292
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能压缩附加对象(%d"
#: builtin/index-pack.c:1388
#, c-format
msgid "local object %s is corrupt"
msgstr "本地对象 %s 已损坏"
#: builtin/index-pack.c:1402
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
#: builtin/index-pack.c:1427
#, c-format
msgid "cannot write %s file '%s'"
msgstr "无法写入 %s 文件 '%s'"
#: builtin/index-pack.c:1435
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "无法关闭已写入的 %s 文件 '%s'"
#: builtin/index-pack.c:1459
msgid "error while closing pack file"
msgstr "关闭包文件时出错"
#: builtin/index-pack.c:1473
msgid "cannot store pack file"
msgstr "无法存储包文件"
#: builtin/index-pack.c:1481
msgid "cannot store index file"
msgstr "无法存储索引文件"
#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "坏的 pack.indexversion=%<PRIu32>"
#: builtin/index-pack.c:1593
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "无法打开现存包文件 '%s'"
#: builtin/index-pack.c:1595
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "无法为 %s 打开包索引文件"
#: builtin/index-pack.c:1643
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "非 delta%d 个对象"
msgstr[1] "非 delta%d 个对象"
#: builtin/index-pack.c:1650
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "链长 = %d: %lu 对象"
msgstr[1] "链长 = %d: %lu 对象"
#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr "无法返回当前工作目录"
#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr "错误选项 %s"
#: builtin/index-pack.c:1777
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 不能和 --stdin 同时使用"
#: builtin/index-pack.c:1779
msgid "--stdin requires a git repository"
msgstr "--stdin 需要一个 git 仓库"
#: builtin/index-pack.c:1785
msgid "--verify with no packfile name given"
msgstr "--verify 没有提供包文件名参数"
#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
msgid "fsck error in pack objects"
msgstr "在打包对象中 fsck 检查出错"
#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
msgstr "不能对模版 '%s' 调用 stat"
#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
msgstr "不能打开目录 '%s'"
#: builtin/init-db.c:78
#, c-format
msgid "cannot readlink '%s'"
msgstr "不能读取链接 '%s'"
#: builtin/init-db.c:80
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "不能自 '%s' 到 '%s' 创建符号链接"
#: builtin/init-db.c:86
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
#: builtin/init-db.c:90
#, c-format
msgid "ignoring template %s"
msgstr "忽略模版 %s"
#: builtin/init-db.c:121
#, c-format
msgid "templates not found in %s"
msgstr "没有在 %s 中找到模版"
#: builtin/init-db.c:136
#, c-format
msgid "not copying templates from '%s': %s"
msgstr "没有从 '%s' 复制模版:%s"
#: builtin/init-db.c:334
#, c-format
msgid "unable to handle file type %d"
msgstr "不能处理 %d 类型的文件"
#: builtin/init-db.c:337
#, c-format
msgid "unable to move %s to %s"
msgstr "不能移动 %s 至 %s"
#: builtin/init-db.c:354 builtin/init-db.c:357
#, c-format
msgid "%s already exists"
msgstr "%s 已经存在"
#: builtin/init-db.c:413
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
#: builtin/init-db.c:414
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
#: builtin/init-db.c:418
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
#: builtin/init-db.c:419
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "已初始化空的 Git 仓库于 %s%s\n"
#: builtin/init-db.c:468
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
"[<目录>]"
#: builtin/init-db.c:491
msgid "permissions"
msgstr "权限"
#: builtin/init-db.c:492
msgid "specify that the git repository is to be shared amongst several users"
msgstr "指定 git 仓库是多个用户之间共享的"
#: builtin/init-db.c:529 builtin/init-db.c:534
#, c-format
msgid "cannot mkdir %s"
msgstr "不能创建目录 %s"
#: builtin/init-db.c:538
#, c-format
msgid "cannot chdir to %s"
msgstr "不能切换目录到 %s"
#: builtin/init-db.c:559
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr "不允许 %s或 --work-tree=<目录>)而没有指定 %s或 --git-dir=<目录>"
#: builtin/init-db.c:587
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "不能访问工作区 '%s'"
#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<token>[(=|:)<value>])...] [<file>...]"
msgstr ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
">])...] [<文件>...]"
#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "在原位编辑文件"
#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "删除空的尾部署名"
#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "在哪里放置新的尾部署名"
#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "当尾部署名已经存在时所采取的动作"
#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "当尾部署名缺失时所采取的动作"
#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "只输出尾部署名"
#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "不要应用配置规则"
#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "连接空白折行的值"
#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "设置解析选项"
#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
msgstr "不要对 --- 特殊处理"
#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "尾部署名"
#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "要添加的尾部署名"
#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer 和 --only-input 同时使用没有意义"
#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "没有给出要原位编辑的文件"
#: builtin/log.c:55
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
#: builtin/log.c:56
msgid "git show [<options>] <object>..."
msgstr "git show [<选项>] <对象>..."
#: builtin/log.c:109
#, c-format
msgid "invalid --decorate option: %s"
msgstr "无效的 --decorate 选项:%s"
#: builtin/log.c:173
msgid "show source"
msgstr "显示源"
#: builtin/log.c:174
msgid "Use mail map file"
msgstr "使用邮件映射文件"
#: builtin/log.c:176
msgid "only decorate refs that match <pattern>"
msgstr "只修饰与 <模式> 匹配的引用"
#: builtin/log.c:178
msgid "do not decorate refs that match <pattern>"
msgstr "不修饰和 <模式> 匹配的引用"
#: builtin/log.c:179
msgid "decorate options"
msgstr "修饰选项"
#: builtin/log.c:182
msgid "Process line range n,m in file, counting from 1"
msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
#: builtin/log.c:280
#, c-format
msgid "Final output: %d %s\n"
msgstr "最终输出:%d %s\n"
#: builtin/log.c:534
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 损坏的文件"
#: builtin/log.c:549 builtin/log.c:643
#, c-format
msgid "could not read object %s"
msgstr "不能读取对象 %s"
#: builtin/log.c:668
#, c-format
msgid "unknown type: %d"
msgstr "未知类型:%d"
#: builtin/log.c:791
msgid "format.headers without value"
msgstr "format.headers 没有值"
#: builtin/log.c:908
msgid "name of output directory is too long"
msgstr "输出目录名太长"
#: builtin/log.c:924
#, c-format
msgid "cannot open patch file %s"
msgstr "无法打开补丁文件 %s"
#: builtin/log.c:941
msgid "need exactly one range"
msgstr "只需要一个范围"
#: builtin/log.c:951
msgid "not a range"
msgstr "不是一个范围"
#: builtin/log.c:1074
msgid "cover letter needs email format"
msgstr "附函需要邮件地址格式"
#: builtin/log.c:1080
msgid "failed to create cover-letter file"
msgstr "无法创建附函文件"
#: builtin/log.c:1159
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to%s"
#: builtin/log.c:1186
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
#: builtin/log.c:1244
msgid "two output directories?"
msgstr "两个输出目录?"
#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
#, c-format
msgid "unknown commit %s"
msgstr "未知提交 %s"
#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "无法将 '%s' 解析为一个有效引用"
#: builtin/log.c:1370
msgid "could not find exact merge base"
msgstr "不能找到准确的合并基线"
#: builtin/log.c:1374
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
"无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
"参数 --base=<基线提交> 手动指定一个基线提交"
#: builtin/log.c:1394
msgid "failed to find exact merge base"
msgstr "无法找到准确的合并基线"
#: builtin/log.c:1405
msgid "base commit should be the ancestor of revision list"
msgstr "基线提交应该是版本列表的祖先"
#: builtin/log.c:1409
msgid "base commit shouldn't be in revision list"
msgstr "基线提交不应该出现在版本列表中"
#: builtin/log.c:1462
msgid "cannot get patch id"
msgstr "无法得到补丁 id"
#: builtin/log.c:1514
msgid "failed to infer range-diff ranges"
msgstr "无法推断 range-diff 范围"
#: builtin/log.c:1559
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m],即使只有一个补丁"
#: builtin/log.c:1562
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH],即使有多个补丁"
#: builtin/log.c:1566
msgid "print patches to standard out"
msgstr "打印补丁到标准输出"
#: builtin/log.c:1568
msgid "generate a cover letter"
msgstr "生成一封附函"
#: builtin/log.c:1570
msgid "use simple number sequence for output file names"
msgstr "使用简单的数字序列作为输出文件名"
#: builtin/log.c:1571
msgid "sfx"
msgstr "后缀"
#: builtin/log.c:1572
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <后缀> 代替 '.patch'"
#: builtin/log.c:1574
msgid "start numbering patches at <n> instead of 1"
msgstr "补丁以 <n> 开始编号而不是1"
#: builtin/log.c:1576
msgid "mark the series as Nth re-roll"
msgstr "标记补丁系列是第几次重制"
#: builtin/log.c:1578
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "使用 [RFC PATCH] 代替 [PATCH]"
#: builtin/log.c:1581
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前缀>] 代替 [PATCH]"
#: builtin/log.c:1584
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <目录>"
#: builtin/log.c:1587
msgid "don't strip/add [PATCH]"
msgstr "不删除/添加 [PATCH]"
#: builtin/log.c:1590
msgid "don't output binary diffs"
msgstr "不输出二进制差异"
#: builtin/log.c:1592
msgid "output all-zero hash in From header"
msgstr "在 From 头信息中输出全为零的哈希值"
#: builtin/log.c:1594
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的补丁"
#: builtin/log.c:1596
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补丁格式而非默认的(补丁+状态)"
#: builtin/log.c:1598
msgid "Messaging"
msgstr "邮件发送"
#: builtin/log.c:1599
msgid "header"
msgstr "header"
#: builtin/log.c:1600
msgid "add email header"
msgstr "添加邮件头"
#: builtin/log.c:1601 builtin/log.c:1603
msgid "email"
msgstr "邮件地址"
#: builtin/log.c:1601
msgid "add To: header"
msgstr "添加收件人"
#: builtin/log.c:1603
msgid "add Cc: header"
msgstr "添加抄送"
#: builtin/log.c:1605
msgid "ident"
msgstr "标识"
#: builtin/log.c:1606
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
#: builtin/log.c:1608
msgid "message-id"
msgstr "邮件标识"
#: builtin/log.c:1609
msgid "make first mail a reply to <message-id>"
msgstr "使第一封邮件作为对 <邮件标识> 的回复"
#: builtin/log.c:1610 builtin/log.c:1613
msgid "boundary"
msgstr "边界"
#: builtin/log.c:1611
msgid "attach the patch"
msgstr "附件方式添加补丁"
#: builtin/log.c:1614
msgid "inline the patch"
msgstr "内联显示补丁"
#: builtin/log.c:1618
msgid "enable message threading, styles: shallow, deep"
msgstr "启用邮件线索,风格:浅,深"
#: builtin/log.c:1620
msgid "signature"
msgstr "签名"
#: builtin/log.c:1621
msgid "add a signature"
msgstr "添加一个签名"
#: builtin/log.c:1622
msgid "base-commit"
msgstr "基线提交"
#: builtin/log.c:1623
msgid "add prerequisite tree info to the patch series"
msgstr "为补丁列表添加前置树信息"
#: builtin/log.c:1625
msgid "add a signature from a file"
msgstr "从文件添加一个签名"
#: builtin/log.c:1626
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
#: builtin/log.c:1628
msgid "show progress while generating patches"
msgstr "在生成补丁时显示进度"
#: builtin/log.c:1630
msgid "show changes against <rev> in cover letter or single patch"
msgstr "在附函或单个补丁中显示和 <rev> 的差异"
#: builtin/log.c:1633
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "在附函或单个补丁中显示和 <refspec> 的差异"
#: builtin/log.c:1635
msgid "percentage by which creation is weighted"
msgstr "创建权重的百分比"
#: builtin/log.c:1710
#, c-format
msgid "invalid ident line: %s"
msgstr "包含无效的身份标识:%s"
#: builtin/log.c:1725
msgid "-n and -k are mutually exclusive"
msgstr "-n 和 -k 互斥"
#: builtin/log.c:1727
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc 和 -k 互斥"
#: builtin/log.c:1735
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
#: builtin/log.c:1737
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
#: builtin/log.c:1739
msgid "--check does not make sense"
msgstr "--check 无意义"
#: builtin/log.c:1771
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录,哪一个?"
#: builtin/log.c:1860
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff 需要 --cover-letter 或单一补丁"
#: builtin/log.c:1864
msgid "Interdiff:"
msgstr "版本间差异:"
#: builtin/log.c:1865
#, c-format
msgid "Interdiff against v%d:"
msgstr "对 v%d 的版本差异:"
#: builtin/log.c:1871
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor 需要 --range-diff"
#: builtin/log.c:1875
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff 需要 --cover-letter 或单一补丁"
#: builtin/log.c:1883
msgid "Range-diff:"
msgstr "范围差异:"
#: builtin/log.c:1884
#, c-format
msgid "Range-diff against v%d:"
msgstr "对 v%d 的范围差异:"
#: builtin/log.c:1895
#, c-format
msgid "unable to read signature file '%s'"
msgstr "无法读取签名文件 '%s'"
#: builtin/log.c:1931
msgid "Generating patches"
msgstr "生成补丁"
#: builtin/log.c:1975
msgid "failed to create output files"
msgstr "无法创建输出文件"
#: builtin/log.c:2034
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
#: builtin/log.c:2088
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
#: builtin/ls-files.c:470
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<选项>] [<文件>...]"
#: builtin/ls-files.c:526
msgid "identify the file status with tags"
msgstr "用标签标识文件的状态"
#: builtin/ls-files.c:528
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小写字母表示 '假设未改变的' 文件"
#: builtin/ls-files.c:530
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "使用小写字母表示 'fsmonitor clean' 文件"
#: builtin/ls-files.c:532
msgid "show cached files in the output (default)"
msgstr "显示缓存的文件(默认)"
#: builtin/ls-files.c:534
msgid "show deleted files in the output"
msgstr "显示已删除的文件"
#: builtin/ls-files.c:536
msgid "show modified files in the output"
msgstr "显示已修改的文件"
#: builtin/ls-files.c:538
msgid "show other files in the output"
msgstr "显示其它文件"
#: builtin/ls-files.c:540
msgid "show ignored files in the output"
msgstr "显示忽略的文件"
#: builtin/ls-files.c:543
msgid "show staged contents' object name in the output"
msgstr "显示暂存区内容的对象名称"
#: builtin/ls-files.c:545
msgid "show files on the filesystem that need to be removed"
msgstr "显示文件系统需要删除的文件"
#: builtin/ls-files.c:547
msgid "show 'other' directories' names only"
msgstr "只显示“其他”目录的名称"
#: builtin/ls-files.c:549
msgid "show line endings of files"
msgstr "显示文件换行符格式"
#: builtin/ls-files.c:551
msgid "don't show empty directories"
msgstr "不显示空目录"
#: builtin/ls-files.c:554
msgid "show unmerged files in the output"
msgstr "显示未合并的文件"
#: builtin/ls-files.c:556
msgid "show resolve-undo information"
msgstr "显示 resolve-undo 信息"
#: builtin/ls-files.c:558
msgid "skip files matching pattern"
msgstr "匹配排除文件的模式"
#: builtin/ls-files.c:561
msgid "exclude patterns are read from <file>"
msgstr "从 <文件> 中读取排除模式"
#: builtin/ls-files.c:564
msgid "read additional per-directory exclude patterns in <file>"
msgstr "从 <文件> 读取额外的每个目录的排除模式"
#: builtin/ls-files.c:566
msgid "add the standard git exclusions"
msgstr "添加标准的 git 排除"
#: builtin/ls-files.c:570
msgid "make the output relative to the project top directory"
msgstr "显示相对于顶级目录的文件名"
#: builtin/ls-files.c:573
msgid "recurse through submodules"
msgstr "在子模组中递归"
#: builtin/ls-files.c:575
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <文件> 都不在索引区,视为错误"
#: builtin/ls-files.c:576
msgid "tree-ish"
msgstr "树或提交"
#: builtin/ls-files.c:577
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
#: builtin/ls-files.c:579
msgid "show debugging data"
msgstr "显示调试数据"
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<repository> [<refs>...]]"
msgstr ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<仓库> [<引用>...]]"
#: builtin/ls-remote.c:59
msgid "do not print remote URL"
msgstr "不打印远程 URL"
#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
msgid "exec"
msgstr "exec"
#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
msgid "path of git-upload-pack on the remote host"
msgstr "远程主机上的 git-upload-pack 路径"
#: builtin/ls-remote.c:65
msgid "limit to tags"
msgstr "仅限于标签"
#: builtin/ls-remote.c:66
msgid "limit to heads"
msgstr "仅限于分支"
#: builtin/ls-remote.c:67
msgid "do not show peeled tags"
msgstr "不显示已解析的标签"
#: builtin/ls-remote.c:69
msgid "take url.<base>.insteadOf into account"
msgstr "参考 url.<base>.insteadOf 设置"
#: builtin/ls-remote.c:72
msgid "exit with exit code 2 if no matching refs are found"
msgstr "若未找到匹配的引用则以退出码2退出"
#: builtin/ls-remote.c:75
msgid "show underlying ref in addition to the object pointed by it"
msgstr "除了显示指向的对象外,显示指向的引用名"
#: builtin/ls-tree.c:30
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
#: builtin/ls-tree.c:128
msgid "only show trees"
msgstr "只显示树"
#: builtin/ls-tree.c:130
msgid "recurse into subtrees"
msgstr "递归到子树"
#: builtin/ls-tree.c:132
msgid "show trees when recursing"
msgstr "当递归时显示树"
#: builtin/ls-tree.c:135
msgid "terminate entries with NUL byte"
msgstr "条目以 NUL 字符终止"
#: builtin/ls-tree.c:136
msgid "include object size"
msgstr "包括对象大小"
#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
msgid "list only filenames"
msgstr "只列出文件名"
#: builtin/ls-tree.c:143
msgid "use full path names"
msgstr "使用文件的全路径"
#: builtin/ls-tree.c:145
msgid "list entire tree; not just current directory (implies --full-name)"
msgstr "列出整个树;不仅仅当前目录(隐含 --full-name"
#: builtin/mailsplit.c:241
#, c-format
msgid "empty mbox: '%s'"
msgstr "空的 mbox'%s'"
#: builtin/merge.c:55
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<选项>] [<提交>...]"
#: builtin/merge.c:56
msgid "git merge --abort"
msgstr "git merge --abort"
#: builtin/merge.c:57
msgid "git merge --continue"
msgstr "git merge --continue"
#: builtin/merge.c:118
msgid "switch `m' requires a value"
msgstr "开关 `m' 需要一个值"
#: builtin/merge.c:141
#, c-format
msgid "option `%s' requires a value"
msgstr "选项 `%s' 需要一个值"
#: builtin/merge.c:187
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "不能找到合并策略 '%s'。\n"
#: builtin/merge.c:188
#, c-format
msgid "Available strategies are:"
msgstr "可用的策略有:"
#: builtin/merge.c:193
#, c-format
msgid "Available custom strategies are:"
msgstr "可用的自定义策略有:"
#: builtin/merge.c:244 builtin/pull.c:151
msgid "do not show a diffstat at the end of the merge"
msgstr "在合并的最后不显示差异统计"
#: builtin/merge.c:247 builtin/pull.c:154
msgid "show a diffstat at the end of the merge"
msgstr "在合并的最后显示差异统计"
#: builtin/merge.c:248 builtin/pull.c:157
msgid "(synonym to --stat)"
msgstr "(和 --stat 同义)"
#: builtin/merge.c:250 builtin/pull.c:160
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
#: builtin/merge.c:253 builtin/pull.c:166
msgid "create a single commit instead of doing a merge"
msgstr "创建一个单独的提交而不是做一次合并"
#: builtin/merge.c:255 builtin/pull.c:169
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果合并成功,执行一次提交(默认)"
#: builtin/merge.c:257 builtin/pull.c:172
msgid "edit message before committing"
msgstr "在提交前编辑提交说明"
#: builtin/merge.c:259
msgid "allow fast-forward (default)"
msgstr "允许快进(默认)"
#: builtin/merge.c:261 builtin/pull.c:179
msgid "abort if fast-forward is not possible"
msgstr "如果不能快进就放弃合并"
#: builtin/merge.c:265 builtin/pull.c:182
msgid "verify that the named commit has a valid GPG signature"
msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186
#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114
msgid "strategy"
msgstr "策略"
#: builtin/merge.c:267 builtin/pull.c:187
msgid "merge strategy to use"
msgstr "要使用的合并策略"
#: builtin/merge.c:268 builtin/pull.c:190
msgid "option=value"
msgstr "option=value"
#: builtin/merge.c:269 builtin/pull.c:191
msgid "option for selected merge strategy"
msgstr "所选的合并策略的选项"
#: builtin/merge.c:271
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "合并的提交说明(针对非快进式合并)"
#: builtin/merge.c:278
msgid "abort the current in-progress merge"
msgstr "放弃当前正在进行的合并"
#
#: builtin/merge.c:280
msgid "--abort but leave index and working tree alone"
msgstr "--abort但是保留索引和工作区"
#: builtin/merge.c:282
msgid "continue the current in-progress merge"
msgstr "继续当前正在进行的合并"
#: builtin/merge.c:284 builtin/pull.c:198
msgid "allow merging unrelated histories"
msgstr "允许合并不相关的历史"
#: builtin/merge.c:290
msgid "verify commit-msg hook"
msgstr "校验 commit-msg 钩子"
#: builtin/merge.c:307
msgid "could not run stash."
msgstr "不能运行贮藏。"
#: builtin/merge.c:312
msgid "stash failed"
msgstr "贮藏失败"
#: builtin/merge.c:317
#, c-format
msgid "not a valid object: %s"
msgstr "不是一个有效对象:%s"
#: builtin/merge.c:339 builtin/merge.c:356
msgid "read-tree failed"
msgstr "读取树失败"
# 译者:注意保持前导空格
#: builtin/merge.c:386
msgid " (nothing to squash)"
msgstr " (无可压缩)"
#: builtin/merge.c:397
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "压缩提交 -- 未更新 HEAD\n"
#: builtin/merge.c:447
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "无合并信息 -- 未更新 HEAD\n"
#: builtin/merge.c:498
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' 没有指向一个提交"
#: builtin/merge.c:585
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
#: builtin/merge.c:708
msgid "Not handling anything other than two heads merge."
msgstr "未处理两个头合并之外的任何操作。"
#: builtin/merge.c:722
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursive 的未知选项:-X%s"
#: builtin/merge.c:737
#, c-format
msgid "unable to write %s"
msgstr "不能写 %s"
#: builtin/merge.c:789
#, c-format
msgid "Could not read from '%s'"
msgstr "不能从 '%s' 读取"
#: builtin/merge.c:798
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
#: builtin/merge.c:804
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"\n"
msgstr ""
"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
"合并到主题分支。\n"
"\n"
#: builtin/merge.c:809
msgid "An empty message aborts the commit.\n"
msgstr "空的提交说明会终止提交。\n"
#: builtin/merge.c:812
#, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr "以 '%c' 开始的行将被忽略,而空的提交说明将终止提交。\n"
#: builtin/merge.c:853
msgid "Empty commit message."
msgstr "空提交信息。"
#: builtin/merge.c:872
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
#: builtin/merge.c:933
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
#: builtin/merge.c:972
msgid "No current branch."
msgstr "没有当前分支。"
#: builtin/merge.c:974
msgid "No remote for the current branch."
msgstr "当前分支没有对应的远程仓库。"
#: builtin/merge.c:976
msgid "No default upstream defined for the current branch."
msgstr "当前分支没有定义默认的上游分支。"
#: builtin/merge.c:981
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
#: builtin/merge.c:1038
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
#: builtin/merge.c:1141
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "不能在 %s 中合并:%s"
#: builtin/merge.c:1175
msgid "not something we can merge"
msgstr "不能合并"
#: builtin/merge.c:1278
msgid "--abort expects no arguments"
msgstr "--abort 不带参数"
#: builtin/merge.c:1282
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并MERGE_HEAD 丢失)。"
#: builtin/merge.c:1291
msgid "--quit expects no arguments"
msgstr "--quit 不带参数"
#: builtin/merge.c:1304
msgid "--continue expects no arguments"
msgstr "--continue 不带参数"
#: builtin/merge.c:1308
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "没有进行中的合并MERGE_HEAD 丢失)。"
#: builtin/merge.c:1324
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
"您尚未结束您的合并(存在 MERGE_HEAD。\n"
"请在合并前先提交您的修改。"
#: builtin/merge.c:1331
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD。\n"
"请在合并前先提交您的修改。"
#: builtin/merge.c:1334
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD。"
#: builtin/merge.c:1348
msgid "You cannot combine --squash with --no-ff."
msgstr "您不能将 --squash 和 --no-ff 组合使用。"
#: builtin/merge.c:1350
msgid "You cannot combine --squash with --commit."
msgstr "您不能将 --squash 和 --commit 组合使用。"
#: builtin/merge.c:1366
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
#: builtin/merge.c:1383
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支持到空分支的压缩提交"
#: builtin/merge.c:1385
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"
#: builtin/merge.c:1390
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"
#: builtin/merge.c:1392
msgid "Can merge only exactly one commit into empty head"
msgstr "只能将一个提交合并到空分支上"
#: builtin/merge.c:1471
msgid "refusing to merge unrelated histories"
msgstr "拒绝合并无关的历史"
#: builtin/merge.c:1480
msgid "Already up to date."
msgstr "已经是最新的。"
#: builtin/merge.c:1490
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
#: builtin/merge.c:1532
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n"
#: builtin/merge.c:1539
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
#: builtin/merge.c:1564
msgid "Already up to date. Yeeah!"
msgstr "已经是最新的。耶!"
#: builtin/merge.c:1570
msgid "Not possible to fast-forward, aborting."
msgstr "无法快进,终止。"
#: builtin/merge.c:1593 builtin/merge.c:1658
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"
#: builtin/merge.c:1597
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"
#: builtin/merge.c:1649
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"
#: builtin/merge.c:1651
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"
#: builtin/merge.c:1660
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"
#: builtin/merge.c:1672
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利,按要求在提交前停止\n"
#: builtin/merge-base.c:32
msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr "git merge-base [-a | --all] <提交> <提交>..."
#: builtin/merge-base.c:33
msgid "git merge-base [-a | --all] --octopus <commit>..."
msgstr "git merge-base [-a | --all] --octopus <提交>..."
#: builtin/merge-base.c:34
msgid "git merge-base --independent <commit>..."
msgstr "git merge-base --independent <提交>..."
#: builtin/merge-base.c:35
msgid "git merge-base --is-ancestor <commit> <commit>"
msgstr "git merge-base --is-ancestor <提交> <提交>"
#: builtin/merge-base.c:36
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <引用> [<提交>]"
#: builtin/merge-base.c:153
msgid "output all common ancestors"
msgstr "输出所有共同的祖先"
#: builtin/merge-base.c:155
msgid "find ancestors for a single n-way merge"
msgstr "查找一个多路合并的祖先提交"
#: builtin/merge-base.c:157
msgid "list revs not reachable from others"
msgstr "显示不能被其他访问到的版本"
#: builtin/merge-base.c:159
msgid "is the first one ancestor of the other?"
msgstr "第一个是其他的祖先提交么?"
#: builtin/merge-base.c:161
msgid "find where <commit> forked from reflog of <ref>"
msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
#: builtin/merge-file.c:9
msgid ""
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
"<orig-file> <file2>"
msgstr ""
"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
"件> <文件2>"
#: builtin/merge-file.c:35
msgid "send results to standard output"
msgstr "将结果发送到标准输出"
#: builtin/merge-file.c:36
msgid "use a diff3 based merge"
msgstr "使用基于 diff3 的合并"
#: builtin/merge-file.c:37
msgid "for conflicts, use our version"
msgstr "如果冲突,使用我们的版本"
#: builtin/merge-file.c:39
msgid "for conflicts, use their version"
msgstr "如果冲突,使用他们的版本"
#: builtin/merge-file.c:41
msgid "for conflicts, use a union version"
msgstr "如果冲突,使用联合版本"
#: builtin/merge-file.c:44
msgid "for conflicts, use this marker size"
msgstr "如果冲突,使用指定长度的标记"
#: builtin/merge-file.c:45
msgid "do not warn about conflicts"
msgstr "不要警告冲突"
#: builtin/merge-file.c:47
msgid "set labels for file1/orig-file/file2"
msgstr "为 文件1/初始文件/文件2 设置标签"
#: builtin/merge-recursive.c:46
#, c-format
msgid "unknown option %s"
msgstr "未知选项 %s"
#: builtin/merge-recursive.c:52
#, c-format
msgid "could not parse object '%s'"
msgstr "不能解析对象 '%s'"
#: builtin/merge-recursive.c:56
#, c-format
msgid "cannot handle more than %d base. Ignoring %s."
msgid_plural "cannot handle more than %d bases. Ignoring %s."
msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
#: builtin/merge-recursive.c:64
msgid "not handling anything other than two heads merge."
msgstr "不能处理两个头合并之外的任何操作。"
#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
#, c-format
msgid "could not resolve ref '%s'"
msgstr "无法解析引用 '%s'"
#: builtin/merge-recursive.c:78
#, c-format
msgid "Merging %s with %s\n"
msgstr "合并 %s 和 %s\n"
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
#: builtin/mktree.c:154
msgid "input is NUL terminated"
msgstr "输入以 NUL 字符终止"
#: builtin/mktree.c:155 builtin/write-tree.c:26
msgid "allow missing objects"
msgstr "允许丢失的对象"
#: builtin/mktree.c:156
msgid "allow creation of more than one tree"
msgstr "允许创建一个以上的树"
#: builtin/multi-pack-index.c:9
msgid ""
"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
"batch-size=<size>)"
msgstr ""
"git multi-pack-index [--object-dir=<目录>] (write|verify|expire|repack --"
"batch-size=<大小>)"
#: builtin/multi-pack-index.c:23
msgid "object directory containing set of packfile and pack-index pairs"
msgstr "包含成对包文件和包索引的对象目录"
#: builtin/multi-pack-index.c:25
msgid ""
"during repack, collect pack-files of smaller size into a batch that is "
"larger than this size"
msgstr "在 repack 期间,将较小尺寸的包文件收集到大于此大小的批次中"
#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
msgid "too many arguments"
msgstr "太多参数"
#: builtin/multi-pack-index.c:52
msgid "--batch-size option is only for 'repack' subcommand"
msgstr "--batch-size 选项仅用于 'repack' 子命令"
#: builtin/multi-pack-index.c:61
#, c-format
msgid "unrecognized subcommand: %s"
msgstr "未识别的子命令:%s"
#: builtin/mv.c:18
msgid "git mv [<options>] <source>... <destination>"
msgstr "git mv [<选项>] <源>... <目标>"
#: builtin/mv.c:83
#, c-format
msgid "Directory %s is in index and no submodule?"
msgstr "目录 %s 在索引中并且不是子模组?"
#: builtin/mv.c:85
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
#: builtin/mv.c:103
#, c-format
msgid "%.*s is in index"
msgstr "%.*s 在索引中"
#: builtin/mv.c:125
msgid "force move/rename even if target exists"
msgstr "强制移动/重命令,即使目标存在"
#: builtin/mv.c:127
msgid "skip move/rename errors"
msgstr "跳过移动/重命名错误"
#: builtin/mv.c:169
#, c-format
msgid "destination '%s' is not a directory"
msgstr "目标 '%s' 不是一个目录"
#: builtin/mv.c:180
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "检查 '%s' 到 '%s' 的重命名\n"
#: builtin/mv.c:184
msgid "bad source"
msgstr "坏的源"
#: builtin/mv.c:187
msgid "can not move directory into itself"
msgstr "不能将目录移动到自身"
#: builtin/mv.c:190
msgid "cannot move directory over file"
msgstr "不能将目录移动到文件"
#: builtin/mv.c:199
msgid "source directory is empty"
msgstr "源目录为空"
#: builtin/mv.c:224
msgid "not under version control"
msgstr "不在版本控制之下"
#: builtin/mv.c:227
msgid "destination exists"
msgstr "目标已存在"
#: builtin/mv.c:235
#, c-format
msgid "overwriting '%s'"
msgstr "覆盖 '%s'"
#: builtin/mv.c:238
msgid "Cannot overwrite"
msgstr "不能覆盖"
#: builtin/mv.c:241
msgid "multiple sources for the same target"
msgstr "同一目标具有多个源"
#: builtin/mv.c:243
msgid "destination directory does not exist"
msgstr "目标目录不存在"
#: builtin/mv.c:250
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s源=%s目标=%s"
#: builtin/mv.c:271
#, c-format
msgid "Renaming %s to %s\n"
msgstr "重命名 %s 至 %s\n"
#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
#, c-format
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
#: builtin/name-rev.c:352
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<选项>] <提交>..."
#: builtin/name-rev.c:353
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<选项>] --all"
#: builtin/name-rev.c:354
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<选项>] --stdin"
#: builtin/name-rev.c:411
msgid "print only names (no SHA-1)"
msgstr "只打印名称(无 SHA-1"
#: builtin/name-rev.c:412
msgid "only use tags to name the commits"
msgstr "只使用标签来命名提交"
#: builtin/name-rev.c:414
msgid "only use refs matching <pattern>"
msgstr "只使用和 <模式> 相匹配的引用"
#: builtin/name-rev.c:416
msgid "ignore refs matching <pattern>"
msgstr "忽略和 <模式> 相匹配的引用"
#: builtin/name-rev.c:418
msgid "list all commits reachable from all refs"
msgstr "列出可以从所有引用访问的提交"
#: builtin/name-rev.c:419
msgid "read from stdin"
msgstr "从标准输入读取"
#: builtin/name-rev.c:420
msgid "allow to print `undefined` names (default)"
msgstr "允许打印 `未定义` 的名称(默认)"
#: builtin/name-rev.c:426
msgid "dereference tags in the input (internal use)"
msgstr "反向解析输入中的标签(内部使用)"
#: builtin/notes.c:28
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
#: builtin/notes.c:29
msgid ""
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
"| (-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
"| (-c | -C) <对象>] [<对象>]"
#: builtin/notes.c:30
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
#: builtin/notes.c:31
msgid ""
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
"(-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
"(-c | -C) <对象>] [<对象>]"
#: builtin/notes.c:32
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
#: builtin/notes.c:33
msgid "git notes [--ref <notes-ref>] show [<object>]"
msgstr "git notes [--ref <注解引用>] show [<对象>]"
#: builtin/notes.c:34
msgid ""
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
#: builtin/notes.c:35
msgid "git notes merge --commit [-v | -q]"
msgstr "git notes merge --commit [-v | -q]"
#: builtin/notes.c:36
msgid "git notes merge --abort [-v | -q]"
msgstr "git notes merge --abort [-v | -q]"
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
#: builtin/notes.c:38
msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
#: builtin/notes.c:39
msgid "git notes [--ref <notes-ref>] get-ref"
msgstr "git notes [--ref <注解引用>] get-ref"
#: builtin/notes.c:44
msgid "git notes [list [<object>]]"
msgstr "git notes [list [<对象>]]"
#: builtin/notes.c:49
msgid "git notes add [<options>] [<object>]"
msgstr "git notes add [<选项>] [<对象>]"
#: builtin/notes.c:54
msgid "git notes copy [<options>] <from-object> <to-object>"
msgstr "git notes copy [<选项>] <源对象> <目标对象>"
#: builtin/notes.c:55
msgid "git notes copy --stdin [<from-object> <to-object>]..."
msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
#: builtin/notes.c:60
msgid "git notes append [<options>] [<object>]"
msgstr "git notes append [<选项>] [<对象>]"
#: builtin/notes.c:65
msgid "git notes edit [<object>]"
msgstr "git notes edit [<对象>]"
#: builtin/notes.c:70
msgid "git notes show [<object>]"
msgstr "git notes show [<对象>]"
#: builtin/notes.c:75
msgid "git notes merge [<options>] <notes-ref>"
msgstr "git notes merge [<选项>] <注解引用>"
#: builtin/notes.c:76
msgid "git notes merge --commit [<options>]"
msgstr "git notes merge --commit [<选项>]"
#: builtin/notes.c:77
msgid "git notes merge --abort [<options>]"
msgstr "git notes merge --abort [<选项>]"
#: builtin/notes.c:82
msgid "git notes remove [<object>]"
msgstr "git notes remove [<对象>]"
#: builtin/notes.c:87
msgid "git notes prune [<options>]"
msgstr "git notes prune [<选项>]"
#: builtin/notes.c:92
msgid "git notes get-ref"
msgstr "git notes get-ref"
#: builtin/notes.c:97
msgid "Write/edit the notes for the following object:"
msgstr "为下面的对象写/编辑说明:"
#: builtin/notes.c:150
#, c-format
msgid "unable to start 'show' for object '%s'"
msgstr "不能为对象 '%s' 开始 'show'"
#: builtin/notes.c:154
msgid "could not read 'show' output"
msgstr "不能读取 'show' 的输出"
#: builtin/notes.c:162
#, c-format
msgid "failed to finish 'show' for object '%s'"
msgstr "无法为对象 '%s' 完成 'show'"
#: builtin/notes.c:197
msgid "please supply the note contents using either -m or -F option"
msgstr "请通过 -m 或 -F 选项为注解提供内容"
#: builtin/notes.c:206
msgid "unable to write note object"
msgstr "不能写注解对象"
#: builtin/notes.c:208
#, c-format
msgid "the note contents have been left in %s"
msgstr "注解内容被留在 %s 中"
#: builtin/notes.c:242 builtin/tag.c:532
#, c-format
msgid "could not open or read '%s'"
msgstr "不能打开或读取 '%s'"
#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
#: builtin/notes.c:265
#, c-format
msgid "failed to read object '%s'."
msgstr "读取对象 '%s' 失败。"
#: builtin/notes.c:268
#, c-format
msgid "cannot read note data from non-blob object '%s'."
msgstr "不能从非数据对象 '%s' 中读取注解数据。"
#: builtin/notes.c:309
#, c-format
msgid "malformed input line: '%s'."
msgstr "格式错误的输入行:'%s'。"
#: builtin/notes.c:324
#, c-format
msgid "failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
#: builtin/notes.c:356
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "拒绝向 %2$s在 refs/notes/ 之外)%1$s注解"
#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
msgid "too many parameters"
msgstr "参数太多"
#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
msgstr "未发现对象 %s 的注解。"
#: builtin/notes.c:410 builtin/notes.c:576
msgid "note contents as a string"
msgstr "注解内容作为一个字符串"
#: builtin/notes.c:413 builtin/notes.c:579
msgid "note contents in a file"
msgstr "注解内容到一个文件中"
#: builtin/notes.c:416 builtin/notes.c:582
msgid "reuse and edit specified note object"
msgstr "重用和编辑指定的注解对象"
#: builtin/notes.c:419 builtin/notes.c:585
msgid "reuse specified note object"
msgstr "重用指定的注解对象"
#: builtin/notes.c:422 builtin/notes.c:588
msgid "allow storing empty note"
msgstr "允许保存空白注释"
#: builtin/notes.c:423 builtin/notes.c:496
msgid "replace existing notes"
msgstr "替换已存在的注解"
#: builtin/notes.c:448
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
#: builtin/notes.c:463 builtin/notes.c:544
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "覆盖对象 %s 现存注解\n"
#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
#, c-format
msgid "Removing note for object %s\n"
msgstr "删除对象 %s 的注解\n"
#: builtin/notes.c:497
msgid "read objects from stdin"
msgstr "从标准输入读取对象"
#: builtin/notes.c:499
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "重新加载 <命令> 的配置(隐含 --stdin"
#: builtin/notes.c:517
msgid "too few parameters"
msgstr "参数太少"
#: builtin/notes.c:538
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
#: builtin/notes.c:550
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "源对象 %s 缺少注解。不能拷贝。"
#: builtin/notes.c:603
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
"请换用 'git notes add -f -m/-F/-c/-C'。\n"
#: builtin/notes.c:698
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "删除引用 NOTES_MERGE_PARTIAL 失败"
#: builtin/notes.c:700
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "删除引用 NOTES_MERGE_REF 失败"
#: builtin/notes.c:702
msgid "failed to remove 'git notes merge' worktree"
msgstr "删除 'git notes merge' 工作区失败"
#: builtin/notes.c:722
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "读取引用 NOTES_MERGE_PARTIAL 失败"
#: builtin/notes.c:724
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
#: builtin/notes.c:739
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "解析 NOTES_MERGE_REF 失败"
#: builtin/notes.c:742
msgid "failed to finalize notes merge"
msgstr "无法完成注解合并"
#: builtin/notes.c:768
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "未知的注解合并策略 %s"
#: builtin/notes.c:784
msgid "General options"
msgstr "通用选项"
#: builtin/notes.c:786
msgid "Merge options"
msgstr "合并选项"
#: builtin/notes.c:788
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
#: builtin/notes.c:790
msgid "Committing unmerged notes"
msgstr "提交未合并的注解"
#: builtin/notes.c:792
msgid "finalize notes merge by committing unmerged notes"
msgstr "通过提交未合并的注解来完成注解合并"
#: builtin/notes.c:794
msgid "Aborting notes merge resolution"
msgstr "中止注解合并的方案"
#: builtin/notes.c:796
msgid "abort notes merge"
msgstr "中止注解合并"
#: builtin/notes.c:807
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "不能混用 --commit、--abort 或 -s/--strategy"
#: builtin/notes.c:812
msgid "must specify a notes ref to merge"
msgstr "必须指定一个注解引用来合并"
#: builtin/notes.c:836
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "未知的 -s/--strategy%s"
#: builtin/notes.c:873
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
#: builtin/notes.c:876
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "无法存储链接到当前的注解引用(%s"
#: builtin/notes.c:878
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
"'git notes merge --commit', or abort the merge with 'git notes merge --"
"abort'.\n"
msgstr ""
"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
#: builtin/notes.c:897 builtin/tag.c:545
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
#: builtin/notes.c:900
#, c-format
msgid "Object %s has no note\n"
msgstr "对象 %s 没有注解\n"
#: builtin/notes.c:912
msgid "attempt to remove non-existent note is not an error"
msgstr "尝试删除不存在的注解不是一个错误"
#: builtin/notes.c:915
msgid "read object names from the standard input"
msgstr "从标准输入读取对象名称"
#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
msgid "do not remove, show only"
msgstr "不删除,只显示"
#: builtin/notes.c:955
msgid "report pruned notes"
msgstr "报告清除的注解"
#: builtin/notes.c:998
msgid "notes-ref"
msgstr "注解引用"
#: builtin/notes.c:999
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
#: builtin/notes.c:1034 builtin/stash.c:1598
#, c-format
msgid "unknown subcommand: %s"
msgstr "未知子命令:%s"
#: builtin/pack-objects.c:52
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
#: builtin/pack-objects.c:53
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
#: builtin/pack-objects.c:428
#, c-format
msgid "bad packed object CRC for %s"
msgstr "%s 错的包对象 CRC"
#: builtin/pack-objects.c:439
#, c-format
msgid "corrupt packed object for %s"
msgstr "%s 损坏的包对象"
#: builtin/pack-objects.c:570
#, c-format
msgid "recursive delta detected for object %s"
msgstr "发现对象 %s 递归 delta"
#: builtin/pack-objects.c:781
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "排序了 %u 个对象,预期 %<PRIu32> 个"
#: builtin/pack-objects.c:794
#, c-format
msgid "packfile is invalid: %s"
msgstr "无效的包文件:%s"
#: builtin/pack-objects.c:798
#, c-format
msgid "unable to open packfile for reuse: %s"
msgstr "无法为重用打开包文件:%s"
#: builtin/pack-objects.c:802
msgid "unable to seek in reused packfile"
msgstr "无法在重用的包文件中查找"
#: builtin/pack-objects.c:813
msgid "unable to read from reused packfile"
msgstr "无法读取索引文件"
#: builtin/pack-objects.c:841
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
#: builtin/pack-objects.c:854
msgid "Writing objects"
msgstr "写入对象中"
#: builtin/pack-objects.c:917 builtin/update-index.c:89
#, c-format
msgid "failed to stat %s"
msgstr "对 %s 调用 stat 失败"
#: builtin/pack-objects.c:970
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
#: builtin/pack-objects.c:1166
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
#: builtin/pack-objects.c:1597
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "%s 压缩中 delta 基准偏移越界"
#: builtin/pack-objects.c:1606
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "%s 的 delta 基准偏移越界"
#: builtin/pack-objects.c:1875
msgid "Counting objects"
msgstr "对象计数中"
#: builtin/pack-objects.c:2005
#, c-format
msgid "unable to get size of %s"
msgstr "不能得到 %s 的大小"
#: builtin/pack-objects.c:2020
#, c-format
msgid "unable to parse object header of %s"
msgstr "无法解析对象 %s 头信息"
#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
#: builtin/pack-objects.c:2116
#, c-format
msgid "object %s cannot be read"
msgstr "对象 %s 无法读取"
#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>"
#: builtin/pack-objects.c:2130
msgid "suboptimal pack - out of memory"
msgstr "次优suboptimal打包 - 内存不足"
#: builtin/pack-objects.c:2456
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "使用 %d 个线程进行压缩"
#: builtin/pack-objects.c:2588
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "无法为标签 %s 压缩对象"
#: builtin/pack-objects.c:2675
msgid "Compressing objects"
msgstr "压缩对象中"
#: builtin/pack-objects.c:2681
msgid "inconsistency with delta count"
msgstr "不一致的差异计数"
#: builtin/pack-objects.c:2762
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
"预期边界对象edge objectID却得到垃圾数据\n"
" %s"
#: builtin/pack-objects.c:2768
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
"预期对象 ID却得到垃圾数据\n"
" %s"
#: builtin/pack-objects.c:2866
msgid "invalid value for --missing"
msgstr "选项 --missing 的值无效"
#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
msgid "cannot open pack index"
msgstr "无法打开包文件索引"
#: builtin/pack-objects.c:2956
#, c-format
msgid "loose object at %s could not be examined"
msgstr "无法检查 %s 处的松散对象"
#: builtin/pack-objects.c:3041
msgid "unable to force loose object"
msgstr "无法强制松散对象"
#: builtin/pack-objects.c:3133
#, c-format
msgid "not a rev '%s'"
msgstr "不是一个版本 '%s'"
#: builtin/pack-objects.c:3136
#, c-format
msgid "bad revision '%s'"
msgstr "坏的版本 '%s'"
#: builtin/pack-objects.c:3161
msgid "unable to add recent objects"
msgstr "无法添加最近的对象"
#: builtin/pack-objects.c:3214
#, c-format
msgid "unsupported index version %s"
msgstr "不支持的索引版本 %s"
#: builtin/pack-objects.c:3218
#, c-format
msgid "bad index version '%s'"
msgstr "坏的索引版本 '%s'"
#: builtin/pack-objects.c:3248
msgid "do not show progress meter"
msgstr "不显示进度表"
#: builtin/pack-objects.c:3250
msgid "show progress meter"
msgstr "显示进度表"
#: builtin/pack-objects.c:3252
msgid "show progress meter during object writing phase"
msgstr "在对象写入阶段显示进度表"
#: builtin/pack-objects.c:3255
msgid "similar to --all-progress when progress meter is shown"
msgstr "当进度表显示时类似于 --all-progress"
#: builtin/pack-objects.c:3256
msgid "<version>[,<offset>]"
msgstr "<版本>[,<偏移>]"
#: builtin/pack-objects.c:3257
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本来写包索引文件"
#: builtin/pack-objects.c:3260
msgid "maximum size of each output pack file"
msgstr "每个输出包的最大尺寸"
#: builtin/pack-objects.c:3262
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略从备用对象存储里借用对象"
#: builtin/pack-objects.c:3264
msgid "ignore packed objects"
msgstr "忽略包对象"
#: builtin/pack-objects.c:3266
msgid "limit pack window by objects"
msgstr "限制打包窗口的对象数"
#: builtin/pack-objects.c:3268
msgid "limit pack window by memory in addition to object limit"
msgstr "除对象数量限制外设置打包窗口的内存限制"
#: builtin/pack-objects.c:3270
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允许的 delta 链的最大长度"
#: builtin/pack-objects.c:3272
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
#: builtin/pack-objects.c:3274
msgid "reuse existing objects"
msgstr "重用已存在的对象"
#: builtin/pack-objects.c:3276
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 对象"
#: builtin/pack-objects.c:3278
msgid "use threads when searching for best delta matches"
msgstr "使用线程查询最佳 delta 匹配"
#: builtin/pack-objects.c:3280
msgid "do not create an empty pack output"
msgstr "不创建空的包输出"
#: builtin/pack-objects.c:3282
msgid "read revision arguments from standard input"
msgstr "从标准输入读取版本号参数"
#: builtin/pack-objects.c:3284
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的对象"
#: builtin/pack-objects.c:3287
msgid "include objects reachable from any reference"
msgstr "包括可以从任何引用访问到的对象"
#: builtin/pack-objects.c:3290
msgid "include objects referred by reflog entries"
msgstr "包括被引用日志引用到的对象"
#: builtin/pack-objects.c:3293
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的对象"
#: builtin/pack-objects.c:3296
msgid "output pack to stdout"
msgstr "输出包到标准输出"
#: builtin/pack-objects.c:3298
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包对象的标签对象"
#: builtin/pack-objects.c:3300
msgid "keep unreachable objects"
msgstr "维持不可达的对象"
#: builtin/pack-objects.c:3302
msgid "pack loose unreachable objects"
msgstr "打包松散的不可达对象"
#: builtin/pack-objects.c:3304
msgid "unpack unreachable objects newer than <time>"
msgstr "将比给定 <时间> 新的无法访问的对象解包"
#: builtin/pack-objects.c:3307
msgid "use the sparse reachability algorithm"
msgstr "使用稀疏可达性算法"
#: builtin/pack-objects.c:3309
msgid "create thin packs"
msgstr "创建精简包"
#: builtin/pack-objects.c:3311
msgid "create packs suitable for shallow fetches"
msgstr "创建适合浅克隆仓库获取的包"
#: builtin/pack-objects.c:3313
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 文件的包"
#: builtin/pack-objects.c:3315
msgid "ignore this pack"
msgstr "忽略该 pack"
#: builtin/pack-objects.c:3317
msgid "pack compression level"
msgstr "打包压缩级别"
#: builtin/pack-objects.c:3319
msgid "do not hide commits by grafts"
msgstr "显示被移植隐藏的提交"
#: builtin/pack-objects.c:3321
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
#: builtin/pack-objects.c:3323
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同时创建 bitmap 索引"
#: builtin/pack-objects.c:3327
msgid "write a bitmap index if possible"
msgstr "如果可能,写 bitmap 索引"
#: builtin/pack-objects.c:3331
msgid "handling for missing objects"
msgstr "处理丢失的对象"
#: builtin/pack-objects.c:3334
msgid "do not pack objects in promisor packfiles"
msgstr "不要打包 promisor 包文件中的对象"
#: builtin/pack-objects.c:3336
msgid "respect islands during delta compression"
msgstr "在增量压缩时参考数据岛"
#: builtin/pack-objects.c:3361
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "增量链深度 %d 太深了,强制为 %d"
#: builtin/pack-objects.c:3366
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d"
#: builtin/pack-objects.c:3420
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
#: builtin/pack-objects.c:3422
msgid "minimum pack size limit is 1 MiB"
msgstr "最小的包文件大小是 1 MiB"
#: builtin/pack-objects.c:3427
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin 不能用于创建一个可索引包"
#: builtin/pack-objects.c:3430
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
#: builtin/pack-objects.c:3436
msgid "cannot use --filter without --stdout"
msgstr "不能在没有 --stdout 的情况下使用 --filter"
#: builtin/pack-objects.c:3497
msgid "Enumerating objects"
msgstr "枚举对象"
#: builtin/pack-objects.c:3527
#, c-format
msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
msgstr "总共 %<PRIu32> (差异 %<PRIu32>),复用 %<PRIu32> (差异 %<PRIu32>"
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<选项>]"
#: builtin/pack-refs.c:16
msgid "pack everything"
msgstr "打包一切"
#: builtin/pack-refs.c:17
msgid "prune loose refs (default)"
msgstr "清除松散的引用(默认)"
#: builtin/prune-packed.c:9
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
#: builtin/prune-packed.c:42
msgid "Removing duplicate objects"
msgstr "正在删除重复对象"
#: builtin/prune.c:12
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
#: builtin/prune.c:131
msgid "report pruned objects"
msgstr "报告清除的对象"
#: builtin/prune.c:134
msgid "expire objects older than <time>"
msgstr "使早于给定时间的对象过期"
#: builtin/prune.c:136
msgid "limit traversal to objects outside promisor packfiles"
msgstr "限制遍历 promisor 包以外的对象"
#: builtin/prune.c:150
msgid "cannot prune in a precious-objects repo"
msgstr "不能在珍品仓库中执行清理操作"
#: builtin/pull.c:66 builtin/pull.c:68
#, c-format
msgid "Invalid value for %s: %s"
msgstr "%s 的值无效:%s"
#: builtin/pull.c:88
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
#: builtin/pull.c:141
msgid "control for recursive fetching of submodules"
msgstr "控制子模组的递归获取"
#: builtin/pull.c:145
msgid "Options related to merging"
msgstr "和合并相关的选项"
#: builtin/pull.c:148
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用变基操作取代合并操作以合入修改"
#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "允许快进式"
#: builtin/pull.c:185
msgid "automatically stash/stash pop before and after rebase"
msgstr "变基操作前后执行自动贮藏和弹出贮藏"
#: builtin/pull.c:201
msgid "Options related to fetching"
msgstr "和获取相关的参数"
#: builtin/pull.c:211
msgid "force overwrite of local branch"
msgstr "强制覆盖本地分支"
#: builtin/pull.c:219
msgid "number of submodules pulled in parallel"
msgstr "并发拉取的子模组的数量"
#: builtin/pull.c:316
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff 的取值无效:%s"
#: builtin/pull.c:433
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
#: builtin/pull.c:435
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
#: builtin/pull.c:436
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
#: builtin/pull.c:439
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
"a branch. Because this is not the default configured remote\n"
"for your current branch, you must specify a branch on the command line."
msgstr ""
"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "您当前不在一个分支上。"
#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "请指定您要变基到哪一个分支。"
#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "请指定您要合并哪一个分支。"
#: builtin/pull.c:449 builtin/pull.c:464
msgid "See git-pull(1) for details."
msgstr "详见 git-pull(1)。"
#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
#: builtin/rebase.c:1332 git-parse-remote.sh:64
msgid "<remote>"
msgstr "<远程>"
#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<分支>"
#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "当前分支没有跟踪信息。"
#: builtin/pull.c:468 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
#: builtin/pull.c:473
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."
msgstr ""
"您的配置中指定要合并远程的引用 '%s'\n"
"但是没有获取到这个引用。"
#: builtin/pull.c:581
#, c-format
msgid "unable to access commit %s"
msgstr "无法访问提交 %s"
#: builtin/pull.c:861
msgid "ignoring --verify-signatures for rebase"
msgstr "为变基操作忽略 --verify-signatures"
#: builtin/pull.c:916
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
#: builtin/pull.c:924
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未诞生的分支,变更添加至索引。"
#: builtin/pull.c:928
msgid "pull with rebase"
msgstr "变基式拉取"
#: builtin/pull.c:929
msgid "please commit or stash them."
msgstr "请提交或贮藏它们。"
#: builtin/pull.c:954
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"fast-forwarding your working tree from\n"
"commit %s."
msgstr ""
"fetch 更新了当前的分支。快进您的工作区\n"
"至提交 %s。"
#: builtin/pull.c:960
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
"After making sure that you saved anything precious from\n"
"$ git diff %s\n"
"output, run\n"
"$ git reset --hard\n"
"to recover."
msgstr ""
"您当前的工作区无法执行快进操作。\n"
"首先执行如下命令:\n"
"$ git diff %s\n"
"以确认所有有用的数据均已保存。然后执行下面的命令\n"
"$ git reset --hard\n"
"恢复之前的状态。"
#: builtin/pull.c:975
msgid "Cannot merge multiple branches into empty head."
msgstr "无法将多个分支合并到空分支。"
#: builtin/pull.c:979
msgid "Cannot rebase onto multiple branches."
msgstr "无法变基到多个分支。"
#: builtin/pull.c:986
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "本地子模组中有修改,无法变基"
#: builtin/push.c:19
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
#: builtin/push.c:111
msgid "tag shorthand without <tag>"
msgstr "标签后面未提供 <标签> 参数"
#: builtin/push.c:121
msgid "--delete only accepts plain target ref names"
msgstr "--delete 只接受简单的目标引用名"
#: builtin/push.c:167
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
"\n"
"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
#: builtin/push.c:170
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
"the name of your current branch. To push to the upstream branch\n"
"on the remote, use\n"
"\n"
" git push %s HEAD:%s\n"
"\n"
"To push to the branch of the same name on the remote, use\n"
"\n"
" git push %s HEAD\n"
"%s"
msgstr ""
"您当前分支的上游分支和您当前分支名不匹配,为推送到远程的上游分支,\n"
"使用\n"
"\n"
" git push %s HEAD:%s\n"
"\n"
"为推送至远程同名分支,使用\n"
"\n"
" git push %s HEAD\n"
"%s"
#: builtin/push.c:185
#, c-format
msgid ""
"You are not currently on a branch.\n"
"To push the history leading to the current (detached HEAD)\n"
"state now, use\n"
"\n"
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
"您当前不在一个分支上。\n"
"现在为推送当前(分离头指针)的历史,使用\n"
"\n"
" git push %s HEAD:<远程分支名字>\n"
#: builtin/push.c:199
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
"To push the current branch and set the remote as upstream, use\n"
"\n"
" git push --set-upstream %s %s\n"
msgstr ""
"当前分支 %s 没有对应的上游分支。\n"
"为推送当前分支并建立与远程上游的跟踪,使用\n"
"\n"
" git push --set-upstream %s %s\n"
#: builtin/push.c:207
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
#: builtin/push.c:210
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
"your current branch '%s', without telling me what to push\n"
"to update which remote branch."
msgstr ""
"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
"而没有告诉我要推送什么、更新哪个远程分支。"
#: builtin/push.c:269
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
#: builtin/push.c:276
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
"'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
#: builtin/push.c:282
msgid ""
"Updates were rejected because a pushed branch tip is behind its remote\n"
"counterpart. Check out this branch and integrate the remote changes\n"
"(e.g. 'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
#: builtin/push.c:288
msgid ""
"Updates were rejected because the remote contains work that you do\n"
"not have locally. This is usually caused by another repository pushing\n"
"to the same ref. You may want to first integrate the remote changes\n"
"(e.g., 'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
"(如 'git pull ...')。\n"
"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
#: builtin/push.c:295
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "更新被拒绝,因为该标签在远程已经存在。"
#: builtin/push.c:298
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
"without using the '--force' option.\n"
msgstr ""
"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
"也不能更新远程引用让其指向一个非提交对象。\n"
#: builtin/push.c:359
#, c-format
msgid "Pushing to %s\n"
msgstr "推送到 %s\n"
#: builtin/push.c:364
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "推送一些引用到 '%s' 失败"
#: builtin/push.c:398
#, c-format
msgid "bad repository '%s'"
msgstr "坏的仓库 '%s'"
#: builtin/push.c:399
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
"repository using\n"
"\n"
" git remote add <name> <url>\n"
"\n"
"and then push using the remote name\n"
"\n"
" git push <name>\n"
msgstr ""
"没有配置推送目标。\n"
"或通过命令行指定 URL或用下面命令配置一个远程仓库\n"
"\n"
" git remote add <名称> <地址>\n"
"\n"
"然后使用该远程仓库名执行推送\n"
"\n"
" git push <名称>\n"
#: builtin/push.c:554
msgid "repository"
msgstr "仓库"
#: builtin/push.c:555 builtin/send-pack.c:164
msgid "push all refs"
msgstr "推送所有引用"
#: builtin/push.c:556 builtin/send-pack.c:166
msgid "mirror all refs"
msgstr "镜像所有引用"
#: builtin/push.c:558
msgid "delete refs"
msgstr "删除引用"
#: builtin/push.c:559
msgid "push tags (can't be used with --all or --mirror)"
msgstr "推送标签(不能使用 --all or --mirror"
#: builtin/push.c:562 builtin/send-pack.c:167
msgid "force updates"
msgstr "强制更新"
#: builtin/push.c:564 builtin/send-pack.c:181
msgid "<refname>:<expect>"
msgstr "<引用名>:<期望值>"
#: builtin/push.c:565 builtin/send-pack.c:182
msgid "require old value of ref to be at this value"
msgstr "要求引用旧的取值为设定值"
#: builtin/push.c:568
msgid "control recursive pushing of submodules"
msgstr "控制子模组的递归推送"
#: builtin/push.c:570 builtin/send-pack.c:175
msgid "use thin pack"
msgstr "使用精简打包"
#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
#: builtin/send-pack.c:162
msgid "receive pack program"
msgstr "接收包程序"
#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "设置 git pull/status 的上游"
#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "清除本地删除的引用"
#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "绕过 pre-push 钩子"
#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "推送缺失但有关的标签"
#: builtin/push.c:582 builtin/send-pack.c:169
msgid "GPG sign the push"
msgstr "用 GPG 为推送签名"
#: builtin/push.c:584 builtin/send-pack.c:176
msgid "request atomic transaction on remote side"
msgstr "需要远端支持原子事务"
#: builtin/push.c:602
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
#: builtin/push.c:604
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用没有意义"
#: builtin/push.c:607
msgid "--all and --tags are incompatible"
msgstr "--all 和 --tags 不兼容"
#: builtin/push.c:609
msgid "--all can't be combined with refspecs"
msgstr "--all 不能和引用规格同时使用"
#: builtin/push.c:613
msgid "--mirror and --tags are incompatible"
msgstr "--mirror 和 --tags 不兼容"
#: builtin/push.c:615
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror 不能和引用规格同时使用"
#: builtin/push.c:618
msgid "--all and --mirror are incompatible"
msgstr "--all 和 --mirror 不兼容"
#: builtin/push.c:637
msgid "push options must not have new line characters"
msgstr "推送选项不能有换行符"
#: builtin/range-diff.c:8
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>"
#: builtin/range-diff.c:9
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr "git range-diff [<选项>] <old-tip>...<new-tip>"
#: builtin/range-diff.c:10
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>"
#: builtin/range-diff.c:21
msgid "Percentage by which creation is weighted"
msgstr "创建权重的百分比"
#: builtin/range-diff.c:23
msgid "use simple diff colors"
msgstr "使用简单差异颜色"
#: builtin/range-diff.c:46 builtin/range-diff.c:50
#, c-format
msgid "no .. in range: '%s'"
msgstr "没有在范围中使用 ..'%s'"
#: builtin/range-diff.c:60
msgid "single arg format must be symmetric range"
msgstr "单个参数格式必须是对称范围(即包含..."
#: builtin/range-diff.c:75
msgid "need two commit ranges"
msgstr "需要两个提交范围"
#: builtin/read-tree.c:41
msgid ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
msgstr ""
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
#: builtin/read-tree.c:124
msgid "write resulting index to <file>"
msgstr "将索引结果写入 <文件>"
#: builtin/read-tree.c:127
msgid "only empty the index"
msgstr "只是清空索引"
#: builtin/read-tree.c:129
msgid "Merging"
msgstr "合并"
#: builtin/read-tree.c:131
msgid "perform a merge in addition to a read"
msgstr "读取之余再执行一个合并"
#: builtin/read-tree.c:133
msgid "3-way merge if no file level merging required"
msgstr "如果没有文件级合并需要,执行三方合并"
#: builtin/read-tree.c:135
msgid "3-way merge in presence of adds and removes"
msgstr "存在添加和删除时,也执行三方合并"
#: builtin/read-tree.c:137
msgid "same as -m, but discard unmerged entries"
msgstr "类似于 -m但丢弃未合并的条目"
#: builtin/read-tree.c:138
msgid "<subdirectory>/"
msgstr "<子目录>/"
#: builtin/read-tree.c:139
msgid "read the tree into the index under <subdirectory>/"
msgstr "读取树对象到索引的 <子目录>/ 下"
#: builtin/read-tree.c:142
msgid "update working tree with merge result"
msgstr "用合并的结果更新工作区"
#: builtin/read-tree.c:144
msgid "gitignore"
msgstr "gitignore"
#: builtin/read-tree.c:145
msgid "allow explicitly ignored files to be overwritten"
msgstr "允许忽略文件中设定的文件可以被覆盖"
#: builtin/read-tree.c:148
msgid "don't check the working tree after merging"
msgstr "合并后不检查工作区"
#: builtin/read-tree.c:149
msgid "don't update the index or the work tree"
msgstr "不更新索引区和工作区"
#: builtin/read-tree.c:151
msgid "skip applying sparse checkout filter"
msgstr "跳过应用稀疏检出过滤器"
#: builtin/read-tree.c:153
msgid "debug unpack-trees"
msgstr "调试 unpack-trees"
#: builtin/read-tree.c:157
msgid "suppress feedback messages"
msgstr "抑制反馈信息"
#: builtin/rebase.c:32
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
"[<branch>]"
msgstr ""
"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] [<上游>] [<分支>]"
#: builtin/rebase.c:34
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
msgstr ""
"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]"
#: builtin/rebase.c:36
msgid "git rebase --continue | --abort | --skip | --edit-todo"
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
#, c-format
msgid "unusable todo list: '%s'"
msgstr "不可用的待办列表:'%s'"
#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
#, c-format
msgid "could not write '%s'."
msgstr "不能写入 '%s'。"
#: builtin/rebase.c:252
msgid "no HEAD?"
msgstr "没有 HEAD"
#: builtin/rebase.c:279
#, c-format
msgid "could not create temporary %s"
msgstr "无法创建临时的 %s"
#: builtin/rebase.c:285
msgid "could not mark as interactive"
msgstr "无法标记为交互式"
#: builtin/rebase.c:343
msgid "could not generate todo list"
msgstr "无法生成待办列表"
#: builtin/rebase.c:382
msgid "a base commit must be provided with --upstream or --onto"
msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
#: builtin/rebase.c:437
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [<选项>]"
#: builtin/rebase.c:449
msgid "keep empty commits"
msgstr "保持空提交"
#: builtin/rebase.c:451 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "允许提交说明为空"
#: builtin/rebase.c:452
msgid "rebase merge commits"
msgstr "对合并提交变基"
#: builtin/rebase.c:454
msgid "keep original branch points of cousins"
msgstr "保持兄弟提交的原始分支点"
#: builtin/rebase.c:456
msgid "move commits that begin with squash!/fixup!"
msgstr "移动以 squash!/fixup! 开头的提交"
#: builtin/rebase.c:457
msgid "sign commits"
msgstr "签名提交"
#: builtin/rebase.c:459 builtin/rebase.c:1403
msgid "display a diffstat of what changed upstream"
msgstr "显示上游变化的差异统计"
#: builtin/rebase.c:461
msgid "continue rebase"
msgstr "继续变基"
#: builtin/rebase.c:463
msgid "skip commit"
msgstr "跳过提交"
#: builtin/rebase.c:464
msgid "edit the todo list"
msgstr "变基待办列表"
#: builtin/rebase.c:466
msgid "show the current patch"
msgstr "显示当前补丁"
#: builtin/rebase.c:469
msgid "shorten commit ids in the todo list"
msgstr "缩短待办列表中的提交号"
#: builtin/rebase.c:471
msgid "expand commit ids in the todo list"
msgstr "扩展待办列表中的提交号"
#: builtin/rebase.c:473
msgid "check the todo list"
msgstr "检查待办列表"
#: builtin/rebase.c:475
msgid "rearrange fixup/squash lines"
msgstr "重新排列 fixup/squash 行"
#: builtin/rebase.c:477
msgid "insert exec commands in todo list"
msgstr "在待办列表中插入 exec 执行命令"
#: builtin/rebase.c:478
msgid "onto"
msgstr "onto"
#: builtin/rebase.c:481
msgid "restrict-revision"
msgstr "restrict-revision"
#: builtin/rebase.c:481
msgid "restrict revision"
msgstr "限制版本"
#: builtin/rebase.c:483
msgid "squash-onto"
msgstr "squash-onto"
#: builtin/rebase.c:484
msgid "squash onto"
msgstr "squash onto"
#: builtin/rebase.c:486
msgid "the upstream commit"
msgstr "上游提交"
#: builtin/rebase.c:488
msgid "head-name"
msgstr "head-name"
#: builtin/rebase.c:488
msgid "head name"
msgstr "head 名称"
#: builtin/rebase.c:493
msgid "rebase strategy"
msgstr "变基策略"
#: builtin/rebase.c:494
msgid "strategy-opts"
msgstr "strategy-opts"
#: builtin/rebase.c:495
msgid "strategy options"
msgstr "策略选项"
#: builtin/rebase.c:496
msgid "switch-to"
msgstr "切换到"
#: builtin/rebase.c:497
msgid "the branch or commit to checkout"
msgstr "要检出的分支或提交"
#: builtin/rebase.c:498
msgid "onto-name"
msgstr "onto-name"
#: builtin/rebase.c:498
msgid "onto name"
msgstr "onto name"
#: builtin/rebase.c:499
msgid "cmd"
msgstr "cmd"
#: builtin/rebase.c:499
msgid "the command to run"
msgstr "要执行的命令"
#: builtin/rebase.c:502 builtin/rebase.c:1486
msgid "automatically re-schedule any `exec` that fails"
msgstr "自动重新安排任何失败的 `exec`"
#: builtin/rebase.c:518
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "不使用 --rebase-merges则 --[no-]rebase-cousins 没有效果"
#: builtin/rebase.c:534
#, c-format
msgid "%s requires an interactive rebase"
msgstr "%s 需要交互式变基"
#: builtin/rebase.c:586
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "无法获取 'onto''%s'"
#: builtin/rebase.c:601
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "无效的原始 head'%s'"
#: builtin/rebase.c:626
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "忽略无效的 allow_rerere_autoupdate'%s'"
#: builtin/rebase.c:702
#, c-format
msgid "Could not read '%s'"
msgstr "不能读取 '%s'"
#: builtin/rebase.c:720
#, c-format
msgid "Cannot store %s"
msgstr "不能存储 %s"
#: builtin/rebase.c:827
msgid "could not determine HEAD revision"
msgstr "不能确定 HEAD 版本"
#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
"You can instead skip this commit: run \"git rebase --skip\".\n"
"To abort and get back to the state before \"git rebase\", run \"git rebase --"
"abort\"."
msgstr ""
"手工解决所有冲突,执行 \"git add/rm <冲突的文件>\" 标记\n"
"冲突已解决,然后执行 \"git rebase --continue\"。您也可以执行\n"
"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
"\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。"
#: builtin/rebase.c:1031
#, c-format
msgid ""
"\n"
"git encountered an error while preparing the patches to replay\n"
"these revisions:\n"
"\n"
" %s\n"
"\n"
"As a result, git cannot rebase them."
msgstr ""
"\n"
"在为重放这些版本而准备补丁时git 遇到了一个错误:\n"
"\n"
" %s\n"
"\n"
"因此 git 无法对其变基。"
#: builtin/rebase.c:1318
#, c-format
msgid ""
"%s\n"
"Please specify which branch you want to rebase against.\n"
"See git-rebase(1) for details.\n"
"\n"
" git rebase '<branch>'\n"
"\n"
msgstr ""
"%s\n"
"请指定您要变基到哪个分支。\n"
"详见 git-rebase(1)。\n"
"\n"
" git rebase '<branch>'\n"
"\n"
#: builtin/rebase.c:1334
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
"\n"
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
msgstr ""
"如果您想要为此分支创建跟踪信息,您可以执行:\n"
"\n"
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
#: builtin/rebase.c:1364
msgid "exec commands cannot contain newlines"
msgstr "exec 命令不能包含换行符"
#: builtin/rebase.c:1368
msgid "empty exec command"
msgstr "空的 exec 命令"
#: builtin/rebase.c:1396
msgid "rebase onto given branch instead of upstream"
msgstr "变基到给定的分支而非上游"
#: builtin/rebase.c:1398
msgid "allow pre-rebase hook to run"
msgstr "允许执行 pre-rebase 钩子"
#: builtin/rebase.c:1400
msgid "be quiet. implies --no-stat"
msgstr "安静。暗示 --no-stat"
#: builtin/rebase.c:1406
msgid "do not show diffstat of what changed upstream"
msgstr "不显示上游变化的差异统计"
#: builtin/rebase.c:1409
msgid "add a Signed-off-by: line to each commit"
msgstr "为每一个提交添加一个 Signed-off-by: 签名"
#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
msgid "passed to 'git am'"
msgstr "传递给 'git am'"
#: builtin/rebase.c:1419 builtin/rebase.c:1421
msgid "passed to 'git apply'"
msgstr "传递给 'git apply'"
#: builtin/rebase.c:1423 builtin/rebase.c:1426
msgid "cherry-pick all commits, even if unchanged"
msgstr "拣选所有提交,即使未修改"
#: builtin/rebase.c:1428
msgid "continue"
msgstr "继续"
#: builtin/rebase.c:1431
msgid "skip current patch and continue"
msgstr "跳过当前补丁并继续"
# 译者:注意保持前导空格
#: builtin/rebase.c:1433
msgid "abort and check out the original branch"
msgstr "终止并检出原有分支"
#: builtin/rebase.c:1436
msgid "abort but keep HEAD where it is"
msgstr "终止但保持 HEAD 不变"
#: builtin/rebase.c:1437
msgid "edit the todo list during an interactive rebase"
msgstr "在交互式变基中编辑待办列表"
#: builtin/rebase.c:1440
msgid "show the patch file being applied or merged"
msgstr "显示正在应用或合并的补丁文件"
#: builtin/rebase.c:1443
msgid "use merging strategies to rebase"
msgstr "使用合并策略进行变基"
#: builtin/rebase.c:1447
msgid "let the user edit the list of commits to rebase"
msgstr "让用户编辑要变基的提交列表"
#: builtin/rebase.c:1451
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(已弃用)尝试重建合并提交而非忽略它们"
#: builtin/rebase.c:1455
msgid "preserve empty commits during rebase"
msgstr "变基时保留空提交"
#: builtin/rebase.c:1457
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交"
#: builtin/rebase.c:1463
msgid "automatically stash/stash pop before and after"
msgstr "在操作前后执行自动贮藏和弹出贮藏"
#: builtin/rebase.c:1465
msgid "add exec lines after each commit of the editable list"
msgstr "可编辑列表的每一个提交下面增加一行 exec"
#: builtin/rebase.c:1469
msgid "allow rebasing commits with empty messages"
msgstr "允许针对空提交说明的提交变基"
#: builtin/rebase.c:1472
msgid "try to rebase merges instead of skipping them"
msgstr "尝试对合并提交变基而不是忽略它们"
#: builtin/rebase.c:1475
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "使用 'merge-base --fork-point' 来优化上游"
#: builtin/rebase.c:1477
msgid "use the given merge strategy"
msgstr "使用给定的合并策略"
#: builtin/rebase.c:1479 builtin/revert.c:115
msgid "option"
msgstr "选项"
#: builtin/rebase.c:1480
msgid "pass the argument through to the merge strategy"
msgstr "将参数传递给合并策略"
#: builtin/rebase.c:1483
msgid "rebase all reachable commits up to the root(s)"
msgstr "将所有可达的提交变基到根提交"
#: builtin/rebase.c:1500
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgstr ""
"对 rebase.useBuiltin 的支持已被删除!\n"
"详见 'git help config' 中的条目。"
#: builtin/rebase.c:1506
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "看起来 'git-am' 正在执行中。无法变基。"
#: builtin/rebase.c:1547
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
#: builtin/rebase.c:1551
msgid "No rebase in progress?"
msgstr "没有正在进行的变基?"
#: builtin/rebase.c:1555
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
#: builtin/rebase.c:1578
msgid "Cannot read HEAD"
msgstr "不能读取 HEAD"
#: builtin/rebase.c:1590
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
"您必须编辑所有的合并冲突,然后通过 git add\n"
"命令将它们标记为已解决"
#: builtin/rebase.c:1609
msgid "could not discard worktree changes"
msgstr "无法丢弃工作区变更"
#: builtin/rebase.c:1628
#, c-format
msgid "could not move back to %s"
msgstr "无法移回 %s"
#: builtin/rebase.c:1673
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
"I wonder if you are in the middle of another rebase. If that is the\n"
"case, please try\n"
"\t%s\n"
"If that is not the case, please\n"
"\t%s\n"
"and run me again. I am stopping in case you still have something\n"
"valuable there.\n"
msgstr ""
"似乎已有一个 %s 目录,我怀疑您正处于另外一个变基操作过程中。\n"
"如果是这样,请执行\n"
"\t%s\n"
"如果不是这样,请执行\n"
"\t%s\n"
"然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n"
#: builtin/rebase.c:1694
msgid "switch `C' expects a numerical value"
msgstr "开关 `C' 期望一个数字值"
#: builtin/rebase.c:1735
#, c-format
msgid "Unknown mode: %s"
msgstr "未知模式:%s"
#: builtin/rebase.c:1757
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy 需要 --merge 或 --interactive"
#: builtin/rebase.c:1797
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
#: builtin/rebase.c:1809
msgid "cannot combine am options with either interactive or merge options"
msgstr "不能将 am 选项与交互或合并选项同时使用"
#: builtin/rebase.c:1828
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
#: builtin/rebase.c:1832
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"错误:不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
#: builtin/rebase.c:1838
msgid "cannot combine '--rebase-merges' with '--strategy-option'"
msgstr "不能将 '--rebase-merges' 和 '--strategy-option' 同时使用"
#: builtin/rebase.c:1841
msgid "cannot combine '--rebase-merges' with '--strategy'"
msgstr "不能将 '--rebase-merges' 和 '--strategy' 同时使用"
#: builtin/rebase.c:1865
#, c-format
msgid "invalid upstream '%s'"
msgstr "无效的上游 '%s'"
#: builtin/rebase.c:1871
msgid "Could not create new root commit"
msgstr "不能创建新的根提交"
#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s':只需要一个合并基线"
#: builtin/rebase.c:1896
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "没有指向一个有效的提交 '%s'"
#: builtin/rebase.c:1921
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "致命错误:无此分支/提交 '%s'"
#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
#: builtin/submodule--helper.c:1934
#, c-format
msgid "No such ref: %s"
msgstr "没有这样的引用:%s"
#: builtin/rebase.c:1940
msgid "Could not resolve HEAD to a revision"
msgstr "无法将 HEAD 解析为一个版本"
#: builtin/rebase.c:1981
msgid "Cannot autostash"
msgstr "无法 autostash"
#: builtin/rebase.c:1984
#, c-format
msgid "Unexpected stash response: '%s'"
msgstr "意外的 stash 响应:'%s'"
#: builtin/rebase.c:1990
#, c-format
msgid "Could not create directory for '%s'"
msgstr "不能为 '%s' 创建目录"
#: builtin/rebase.c:1993
#, c-format
msgid "Created autostash: %s\n"
msgstr "创建了 autostash%s\n"
#: builtin/rebase.c:1996
msgid "could not reset --hard"
msgstr "无法 reset --hard"
#: builtin/rebase.c:1997 builtin/reset.c:114
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD 现在位于 %s"
#: builtin/rebase.c:2013
msgid "Please commit or stash them."
msgstr "请提交或贮藏修改。"
#: builtin/rebase.c:2040
#, c-format
msgid "could not parse '%s'"
msgstr "无法解析 '%s'"
#: builtin/rebase.c:2053
#, c-format
msgid "could not switch to %s"
msgstr "无法切换到 %s"
#: builtin/rebase.c:2064
msgid "HEAD is up to date."
msgstr "HEAD 是最新的。"
#: builtin/rebase.c:2066
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "当前分支 %s 是最新的。\n"
#: builtin/rebase.c:2074
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD 是最新的,强制变基。"
#: builtin/rebase.c:2076
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "当前分支 %s 是最新的,强制变基。\n"
#: builtin/rebase.c:2084
msgid "The pre-rebase hook refused to rebase."
msgstr "pre-rebase 钩子拒绝了变基操作。"
#: builtin/rebase.c:2091
#, c-format
msgid "Changes to %s:\n"
msgstr "到 %s 的变更:\n"
#: builtin/rebase.c:2094
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "从 %s 到 %s 的变更:\n"
#: builtin/rebase.c:2119
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "首先,回退头指针以便在其上重放您的工作...\n"
#: builtin/rebase.c:2128
msgid "Could not detach HEAD"
msgstr "无法分离头指针"
#: builtin/rebase.c:2137
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "快进 %s 到 %s。\n"
#: builtin/receive-pack.c:32
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <仓库目录>"
#: builtin/receive-pack.c:832
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"with what you pushed, and will require 'git reset --hard' to match\n"
"the work tree to HEAD.\n"
"\n"
"You can set the 'receive.denyCurrentBranch' configuration variable\n"
"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
"its current branch; however, this is not recommended unless you\n"
"arranged to update its work tree to match what you pushed in some\n"
"other way.\n"
"\n"
"To squelch this message and still keep the default behaviour, set\n"
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
"默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
"不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
"\n"
"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
"用某种方式将其工作区更新至您推送的状态。\n"
"\n"
"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
"配置变量为 'refuse'。"
#: builtin/receive-pack.c:852
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"\n"
"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
"'warn' or 'ignore' in the remote repository to allow deleting the\n"
"current branch, with or without a warning message.\n"
"\n"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
"默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
"导致困惑。\n"
"\n"
"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
"'warn'(显示警告信息)或 'ignore'(忽略警告信息)以允许删除当前分支。\n"
"\n"
"若要屏蔽此信息,您可以设置它为 'refuse'。"
#: builtin/receive-pack.c:1938
msgid "quiet"
msgstr "静默模式"
#: builtin/receive-pack.c:1952
msgid "You must specify a directory."
msgstr "您必须指定一个目录。"
#: builtin/reflog.c:17
msgid ""
"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
"<refs>..."
msgstr ""
"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>] [--"
"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引"
"用>..."
#: builtin/reflog.c:22
msgid ""
"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
"<refs>..."
msgstr ""
"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引"
"用>..."
#: builtin/reflog.c:25
msgid "git reflog exists <ref>"
msgstr "git reflog exists <引用>"
#: builtin/reflog.c:567 builtin/reflog.c:572
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' 不是一个有效的时间戳"
#: builtin/reflog.c:605
#, c-format
msgid "Marking reachable objects..."
msgstr "正在标记可达对象..."
#: builtin/reflog.c:643
#, c-format
msgid "%s points nowhere!"
msgstr "%s 指向不存在!"
#: builtin/reflog.c:695
msgid "no reflog specified to delete"
msgstr "未指定要删除的引用日志"
#: builtin/reflog.c:704
#, c-format
msgid "not a reflog: %s"
msgstr "不是一个引用日志:%s"
#: builtin/reflog.c:709
#, c-format
msgid "no reflog for '%s'"
msgstr "没有 '%s' 的引用日志"
#: builtin/reflog.c:755
#, c-format
msgid "invalid ref format: %s"
msgstr "无效的引用格式:%s"
#: builtin/reflog.c:764
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
#: builtin/remote.c:16
msgid "git remote [-v | --verbose]"
msgstr "git remote [-v | --verbose]"
#: builtin/remote.c:17
msgid ""
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <name> <url>"
msgstr ""
"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
"mirror=<fetch|push>] <名称> <地址>"
#: builtin/remote.c:18 builtin/remote.c:38
msgid "git remote rename <old> <new>"
msgstr "git remote rename <旧名称> <新名称>"
#: builtin/remote.c:19 builtin/remote.c:43
msgid "git remote remove <name>"
msgstr "git remote remove <名称>"
#: builtin/remote.c:20 builtin/remote.c:48
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
#: builtin/remote.c:21
msgid "git remote [-v | --verbose] show [-n] <name>"
msgstr "git remote [-v | --verbose] show [-n] <名称>"
#: builtin/remote.c:22
msgid "git remote prune [-n | --dry-run] <name>"
msgstr "git remote prune [-n | --dry-run] <名称>"
#: builtin/remote.c:23
msgid ""
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
#: builtin/remote.c:24
msgid "git remote set-branches [--add] <name> <branch>..."
msgstr "git remote set-branches [--add] <名称> <分支>..."
#: builtin/remote.c:25 builtin/remote.c:74
msgid "git remote get-url [--push] [--all] <name>"
msgstr "git remote get-url [--push] [--all] <名称>"
#: builtin/remote.c:26 builtin/remote.c:79
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
#: builtin/remote.c:27 builtin/remote.c:80
msgid "git remote set-url --add <name> <newurl>"
msgstr "git remote set-url --add <名称> <新的地址>"
#: builtin/remote.c:28 builtin/remote.c:81
msgid "git remote set-url --delete <name> <url>"
msgstr "git remote set-url --delete <名称> <地址>"
#: builtin/remote.c:33
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<选项>] <名称> <地址>"
#: builtin/remote.c:53
msgid "git remote set-branches <name> <branch>..."
msgstr "git remote set-branches <名称> <分支>..."
#: builtin/remote.c:54
msgid "git remote set-branches --add <name> <branch>..."
msgstr "git remote set-branches --add <名称> <分支>..."
#: builtin/remote.c:59
msgid "git remote show [<options>] <name>"
msgstr "git remote show [<选项>] <名称>"
#: builtin/remote.c:64
msgid "git remote prune [<options>] <name>"
msgstr "git remote prune [<选项>] <名称>"
#: builtin/remote.c:69
msgid "git remote update [<options>] [<group> | <remote>]..."
msgstr "git remote update [<选项>] [<组> | <远程>]..."
#: builtin/remote.c:98
#, c-format
msgid "Updating %s"
msgstr "更新 %s 中"
#: builtin/remote.c:130
msgid ""
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
"\t 或 --mirror=push"
#: builtin/remote.c:147
#, c-format
msgid "unknown mirror argument: %s"
msgstr "未知的镜像参数:%s"
#: builtin/remote.c:163
msgid "fetch the remote branches"
msgstr "抓取远程的分支"
#: builtin/remote.c:165
msgid "import all tags and associated objects when fetching"
msgstr "抓取时导入所有的标签和关联对象"
#: builtin/remote.c:168
msgid "or do not fetch any tag at all (--no-tags)"
msgstr "或不抓取任何标签(--no-tags"
#: builtin/remote.c:170
msgid "branch(es) to track"
msgstr "跟踪的分支"
#: builtin/remote.c:171
msgid "master branch"
msgstr "主线分支"
#: builtin/remote.c:173
msgid "set up remote as a mirror to push to or fetch from"
msgstr "把远程设置为用以推送或抓取的镜像"
#: builtin/remote.c:185
msgid "specifying a master branch makes no sense with --mirror"
msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
#: builtin/remote.c:187
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
#: builtin/remote.c:194 builtin/remote.c:636
#, c-format
msgid "remote %s already exists."
msgstr "远程 %s 已经存在。"
#: builtin/remote.c:198 builtin/remote.c:640
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' 不是一个有效的远程名称"
#: builtin/remote.c:238
#, c-format
msgid "Could not setup master '%s'"
msgstr "无法设置 master '%s'"
#: builtin/remote.c:344
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "无法得到引用规格 %s 的获取列表"
#: builtin/remote.c:443 builtin/remote.c:451
msgid "(matching)"
msgstr "(匹配)"
#: builtin/remote.c:455
msgid "(delete)"
msgstr "(删除)"
#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
#, c-format
msgid "No such remote: '%s'"
msgstr "没有此远程仓库:'%s'"
#: builtin/remote.c:646
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "不能重命名配置小节 '%s' 到 '%s'"
#: builtin/remote.c:666
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
"没有更新非默认的获取引用规格\n"
"\t%s\n"
"\t如果必要请手动更新配置。"
#: builtin/remote.c:702
#, c-format
msgid "deleting '%s' failed"
msgstr "删除 '%s' 失败"
#: builtin/remote.c:736
#, c-format
msgid "creating '%s' failed"
msgstr "创建 '%s' 失败"
#: builtin/remote.c:802
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
msgid_plural ""
"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
"to delete them, use:"
msgstr[0] "注意ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
msgstr[1] "注意ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
#: builtin/remote.c:816
#, c-format
msgid "Could not remove config section '%s'"
msgstr "不能移除配置小节 '%s'"
#: builtin/remote.c:917
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的(下一次获取将存储于 remotes/%s"
#: builtin/remote.c:920
msgid " tracked"
msgstr " 已跟踪"
#: builtin/remote.c:922
msgid " stale (use 'git remote prune' to remove)"
msgstr " 过时(使用 'git remote prune' 来移除)"
#: builtin/remote.c:924
msgid " ???"
msgstr " ???"
#: builtin/remote.c:965
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "无效的 branch.%s.merge不能变基到一个以上的分支"
#: builtin/remote.c:974
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "交互式变基到远程 %s"
#: builtin/remote.c:976
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "交互式变基(含合并提交)到远程 %s"
#: builtin/remote.c:979
#, c-format
msgid "rebases onto remote %s"
msgstr "变基到远程 %s"
#: builtin/remote.c:983
#, c-format
msgid " merges with remote %s"
msgstr " 与远程 %s 合并"
#: builtin/remote.c:986
#, c-format
msgid "merges with remote %s"
msgstr "与远程 %s 合并"
#: builtin/remote.c:989
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s 以及和远程 %s\n"
#: builtin/remote.c:1032
msgid "create"
msgstr "创建"
#: builtin/remote.c:1035
msgid "delete"
msgstr "删除"
#: builtin/remote.c:1039
msgid "up to date"
msgstr "最新"
#: builtin/remote.c:1042
msgid "fast-forwardable"
msgstr "可快进"
#: builtin/remote.c:1045
msgid "local out of date"
msgstr "本地已过时"
#: builtin/remote.c:1052
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 强制推送至 %-*s (%s)"
#: builtin/remote.c:1055
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推送至 %-*s (%s)"
#: builtin/remote.c:1059
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 强制推送至 %s"
#: builtin/remote.c:1062
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推送至 %s"
#: builtin/remote.c:1130
msgid "do not query remotes"
msgstr "不查询远程"
#: builtin/remote.c:1157
#, c-format
msgid "* remote %s"
msgstr "* 远程 %s"
#: builtin/remote.c:1158
#, c-format
msgid " Fetch URL: %s"
msgstr " 获取地址:%s"
#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
msgid "(no URL)"
msgstr "(无 URL)"
#. TRANSLATORS: the colon ':' should align
#. with the one in " Fetch URL: %s"
#. translation.
#.
#: builtin/remote.c:1173 builtin/remote.c:1175
#, c-format
msgid " Push URL: %s"
msgstr " 推送地址:%s"
#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支:%s"
# 译者:中文字符串拼接,可删除前导空格
#: builtin/remote.c:1177
msgid "(not queried)"
msgstr "(未查询)"
#: builtin/remote.c:1179
msgid "(unknown)"
msgstr "(未知)"
#: builtin/remote.c:1183
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
#: builtin/remote.c:1195
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " 远程分支:%s"
msgstr[1] " 远程分支:%s"
# 译者:中文字符串拼接,可删除前导空格
#: builtin/remote.c:1198 builtin/remote.c:1224
msgid " (status not queried)"
msgstr "(状态未查询)"
#: builtin/remote.c:1207
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 为 'git pull' 配置的本地分支:"
msgstr[1] " 为 'git pull' 配置的本地分支:"
#: builtin/remote.c:1215
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本地引用将在 'git push' 时被镜像"
#: builtin/remote.c:1221
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 为 'git push' 配置的本地引用%s"
msgstr[1] " 为 'git push' 配置的本地引用%s"
#: builtin/remote.c:1242
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
#: builtin/remote.c:1244
msgid "delete refs/remotes/<name>/HEAD"
msgstr "删除 refs/remotes/<名称>/HEAD"
#: builtin/remote.c:1259
msgid "Cannot determine remote HEAD"
msgstr "无法确定远程 HEAD"
#: builtin/remote.c:1261
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
#: builtin/remote.c:1271
#, c-format
msgid "Could not delete %s"
msgstr "无法删除 %s"
#: builtin/remote.c:1279
#, c-format
msgid "Not a valid ref: %s"
msgstr "不是一个有效引用:%s"
#: builtin/remote.c:1281
#, c-format
msgid "Could not setup %s"
msgstr "不能设置 %s"
# 译者:注意保持前导空格
#: builtin/remote.c:1299
#, c-format
msgid " %s will become dangling!"
msgstr " %s 将成为悬空状态!"
# 译者:注意保持前导空格
#: builtin/remote.c:1300
#, c-format
msgid " %s has become dangling!"
msgstr " %s 已成为悬空状态!"
#: builtin/remote.c:1310
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
#: builtin/remote.c:1311
#, c-format
msgid "URL: %s"
msgstr "URL%s"
#: builtin/remote.c:1327
#, c-format
msgid " * [would prune] %s"
msgstr " * [将删除] %s"
#: builtin/remote.c:1330
#, c-format
msgid " * [pruned] %s"
msgstr " * [已删除] %s"
#: builtin/remote.c:1375
msgid "prune remotes after fetching"
msgstr "抓取后清除远程"
#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
#, c-format
msgid "No such remote '%s'"
msgstr "没有此远程 '%s'"
#: builtin/remote.c:1454
msgid "add branch"
msgstr "添加分支"
#: builtin/remote.c:1461
msgid "no remote specified"
msgstr "未指定远程"
#: builtin/remote.c:1478
msgid "query push URLs rather than fetch URLs"
msgstr "查询推送 URL 地址,而非获取 URL 地址"
#: builtin/remote.c:1480
msgid "return all URLs"
msgstr "返回所有 URL 地址"
#: builtin/remote.c:1508
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "没有给远程仓库 '%s' 设定 URL"
#: builtin/remote.c:1534
msgid "manipulate push URLs"
msgstr "操作推送 URLS"
#: builtin/remote.c:1536
msgid "add URL"
msgstr "添加 URL"
#: builtin/remote.c:1538
msgid "delete URLs"
msgstr "删除 URLS"
#: builtin/remote.c:1545
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 无意义"
#: builtin/remote.c:1584
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "无效的旧 URL 匹配模版:%s"
#: builtin/remote.c:1592
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL%s"
#: builtin/remote.c:1594
msgid "Will not delete all non-push URLs"
msgstr "将不会删除所有非推送 URL 地址"
#: builtin/remote.c:1610
msgid "be verbose; must be placed before a subcommand"
msgstr "冗长输出;必须置于子命令之前"
#: builtin/remote.c:1641
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子命令:%s"
#: builtin/repack.c:22
msgid "git repack [<options>]"
msgstr "git repack [<选项>]"
#: builtin/repack.c:27
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
"或禁用 pack.writebitmaps 配置。"
#: builtin/repack.c:190
msgid "could not start pack-objects to repack promisor objects"
msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
#: builtin/repack.c:229 builtin/repack.c:408
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr "repack期望来自 pack-objects 的完整十六进制对象 ID。"
#: builtin/repack.c:246
msgid "could not finish pack-objects to repack promisor objects"
msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
#: builtin/repack.c:284
msgid "pack everything in a single pack"
msgstr "所有内容打包到一个包文件中"
#: builtin/repack.c:286
msgid "same as -a, and turn unreachable objects loose"
msgstr "和 -a 相同,并将不可达的对象设为松散对象"
#: builtin/repack.c:289
msgid "remove redundant packs, and run git-prune-packed"
msgstr "删除多余的包,运行 git-prune-packed"
#: builtin/repack.c:291
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
#: builtin/repack.c:293
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
#: builtin/repack.c:295
msgid "do not run git-update-server-info"
msgstr "不运行 git-update-server-info"
#: builtin/repack.c:298
msgid "pass --local to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --local"
#: builtin/repack.c:300
msgid "write bitmap index"
msgstr "写 bitmap 索引"
#: builtin/repack.c:302
msgid "pass --delta-islands to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --delta-islands"
#: builtin/repack.c:303
msgid "approxidate"
msgstr "近似日期"
#: builtin/repack.c:304
msgid "with -A, do not loosen objects older than this"
msgstr "使用 -A不要将早于给定时间的对象过期"
#: builtin/repack.c:306
msgid "with -a, repack unreachable objects"
msgstr "使用 -a ,重新对不可达对象打包"
#: builtin/repack.c:308
msgid "size of the window used for delta compression"
msgstr "用于增量压缩的窗口值"
#: builtin/repack.c:309 builtin/repack.c:315
msgid "bytes"
msgstr "字节"
#: builtin/repack.c:310
msgid "same as the above, but limit memory size instead of entries count"
msgstr "和上面的相似,但限制内存大小而非条目数"
#: builtin/repack.c:312
msgid "limits the maximum delta depth"
msgstr "限制最大增量深度"
#: builtin/repack.c:314
msgid "limits the maximum number of threads"
msgstr "限制最大线程数"
#: builtin/repack.c:316
msgid "maximum size of each packfile"
msgstr "每个包文件的最大尺寸"
#: builtin/repack.c:318
msgid "repack objects in packs marked with .keep"
msgstr "对标记为 .keep 的包中的对象重新打包"
#: builtin/repack.c:320
msgid "do not repack this pack"
msgstr "不要对该包文件重新打包"
#: builtin/repack.c:330
msgid "cannot delete packs in a precious-objects repo"
msgstr "不能删除珍品仓库中的打包文件"
#: builtin/repack.c:334
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable 和 -A 不兼容"
#: builtin/repack.c:417
msgid "Nothing new to pack."
msgstr "没有新的要打包。"
#: builtin/repack.c:478
#, c-format
msgid ""
"WARNING: Some packs in use have been renamed by\n"
"WARNING: prefixing old- to their name, in order to\n"
"WARNING: replace them with the new version of the\n"
"WARNING: file. But the operation failed, and the\n"
"WARNING: attempt to rename them back to their\n"
"WARNING: original names also failed.\n"
"WARNING: Please rename them in %s manually:\n"
msgstr ""
"警告:为了将包文件替换为新版本,一些使用中的包已经\n"
"警告:通过添加 old- 前缀的方式重命名。但是操作失败,\n"
"警告:并且尝试重命名改回原有文件名的操作也失败。\n"
"警告:请手动将 %s 下的这些文件重命名:\n"
#: builtin/repack.c:526
#, c-format
msgid "failed to remove '%s'"
msgstr "删除 '%s' 失败"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
msgstr "git replace [-f] <对象> <替换物>"
#: builtin/replace.c:23
msgid "git replace [-f] --edit <object>"
msgstr "git replace [-f] --edit <对象>"
#: builtin/replace.c:24
msgid "git replace [-f] --graft <commit> [<parent>...]"
msgstr "git replace [-f] --graft <提交> [<父提交>...]"
#: builtin/replace.c:25
msgid "git replace [-f] --convert-graft-file"
msgstr "git replace [-f] --convert-graft-file"
#: builtin/replace.c:26
msgid "git replace -d <object>..."
msgstr "git replace -d <对象>..."
#: builtin/replace.c:27
msgid "git replace [--format=<format>] [-l [<pattern>]]"
msgstr "git replace [--format=<格式>] [-l [<模式>]]"
#: builtin/replace.c:90
#, c-format
msgid ""
"invalid replace format '%s'\n"
"valid formats are 'short', 'medium' and 'long'"
msgstr ""
"无效的替换格式 '%s'\n"
"有效的格式有 'short'、'medium' 和 'long'"
#: builtin/replace.c:125
#, c-format
msgid "replace ref '%s' not found"
msgstr "未发现替换引用 '%s'"
#: builtin/replace.c:141
#, c-format
msgid "Deleted replace ref '%s'"
msgstr "已删除替换引用 '%s'"
#: builtin/replace.c:153
#, c-format
msgid "'%s' is not a valid ref name"
msgstr "'%s' 不是一个有效的引用名"
#: builtin/replace.c:158
#, c-format
msgid "replace ref '%s' already exists"
msgstr "替换引用 '%s' 已经存在"
#: builtin/replace.c:178
#, c-format
msgid ""
"Objects must be of the same type.\n"
"'%s' points to a replaced object of type '%s'\n"
"while '%s' points to a replacement object of type '%s'."
msgstr ""
"对象必须属于同一类型。\n"
"'%s' 指向 '%s' 类型的替换对象\n"
"而 '%s' 指向 '%s' 类型的替换对象。"
#: builtin/replace.c:229
#, c-format
msgid "unable to open %s for writing"
msgstr "无法为写入打开 %s"
#: builtin/replace.c:242
msgid "cat-file reported failure"
msgstr "cat-file 报告失败"
#: builtin/replace.c:258
#, c-format
msgid "unable to open %s for reading"
msgstr "无法为读取打开 %s"
#: builtin/replace.c:272
msgid "unable to spawn mktree"
msgstr "无法启动 mktree"
#: builtin/replace.c:276
msgid "unable to read from mktree"
msgstr "无法从 mktree 读取"
#: builtin/replace.c:285
msgid "mktree reported failure"
msgstr "mktree 报告失败"
#: builtin/replace.c:289
msgid "mktree did not return an object name"
msgstr "mktree 没有返回一个对象名"
#: builtin/replace.c:298
#, c-format
msgid "unable to fstat %s"
msgstr "无法对 %s 执行 fstat"
#: builtin/replace.c:303
msgid "unable to write object to database"
msgstr "无法向数据库写入对象"
#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
#: builtin/replace.c:452
#, c-format
msgid "not a valid object name: '%s'"
msgstr "不是一个有效的对象名:'%s'"
#: builtin/replace.c:326
#, c-format
msgid "unable to get object type for %s"
msgstr "无法得到 %s 的对象类型"
#: builtin/replace.c:342
msgid "editing object file failed"
msgstr "编辑对象文件失败"
#: builtin/replace.c:351
#, c-format
msgid "new object is the same as the old one: '%s'"
msgstr "新对象和旧对象相同:'%s'"
#: builtin/replace.c:383
#, c-format
msgid "could not parse %s as a commit"
msgstr "无法将 %s 解析为一个提交"
#: builtin/replace.c:414
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "提交 '%s' 中含有损坏的合并标签"
#: builtin/replace.c:416
#, c-format
msgid "malformed mergetag in commit '%s'"
msgstr "提交 '%s' 中含有格式错误的合并标签"
#: builtin/replace.c:428
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
#: builtin/replace.c:467
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "原始提交 '%s' 中有一个 gpg 签名"
#: builtin/replace.c:468
msgid "the signature will be removed in the replacement commit!"
msgstr "在替换的提交中签名将被移除!"
#: builtin/replace.c:478
#, c-format
msgid "could not write replacement commit for: '%s'"
msgstr "不能为 '%s' 写替换提交"
#: builtin/replace.c:486
#, c-format
msgid "graft for '%s' unnecessary"
msgstr "对 '%s' 移植没有必要"
#: builtin/replace.c:490
#, c-format
msgid "new commit is the same as the old one: '%s'"
msgstr "新提交和旧的一样:'%s'"
#: builtin/replace.c:525
#, c-format
msgid ""
"could not convert the following graft(s):\n"
"%s"
msgstr ""
"不能转换下列移植:\n"
"%s"
#: builtin/replace.c:546
msgid "list replace refs"
msgstr "列出替换的引用"
#: builtin/replace.c:547
msgid "delete replace refs"
msgstr "删除替换的引用"
#: builtin/replace.c:548
msgid "edit existing object"
msgstr "编辑现存的对象"
#: builtin/replace.c:549
msgid "change a commit's parents"
msgstr "修改一个提交的父提交"
#: builtin/replace.c:550
msgid "convert existing graft file"
msgstr "转换现存的移植文件"
#: builtin/replace.c:551
msgid "replace the ref if it exists"
msgstr "如果存在则替换引用"
#: builtin/replace.c:553
msgid "do not pretty-print contents for --edit"
msgstr "不要为 --edit 操作美观显示内容"
#: builtin/replace.c:554
msgid "use this format"
msgstr "使用此格式"
#: builtin/replace.c:567
msgid "--format cannot be used when not listing"
msgstr "不列出时不能使用 --format"
#: builtin/replace.c:575
msgid "-f only makes sense when writing a replacement"
msgstr "只有写一个替换时 -f 才有意义"
#: builtin/replace.c:579
msgid "--raw only makes sense with --edit"
msgstr "--raw 只有和 --edit 共用才有意义"
#: builtin/replace.c:585
msgid "-d needs at least one argument"
msgstr "-d 需要至少一个参数"
#: builtin/replace.c:591
msgid "bad number of arguments"
msgstr "错误的参数个数"
#: builtin/replace.c:597
msgid "-e needs exactly one argument"
msgstr "-e 需要且仅需要一个参数"
#: builtin/replace.c:603
msgid "-g needs at least one argument"
msgstr "-g 需要至少一个参数"
#: builtin/replace.c:609
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file 不带参数"
#: builtin/replace.c:615
msgid "only one pattern can be given with -l"
msgstr "只能为 -l 提供一个模式"
#: builtin/rerere.c:13
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
#: builtin/rerere.c:60
msgid "register clean resolutions in index"
msgstr "在索引中注册干净的解决方案"
#: builtin/rerere.c:79
msgid "'git rerere forget' without paths is deprecated"
msgstr "没有路径的 'git rerere forget' 已经过时"
#: builtin/rerere.c:113
#, c-format
msgid "unable to generate diff for '%s'"
msgstr "无法为 '%s' 生成差异"
#: builtin/reset.c:32
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
#: builtin/reset.c:34
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
#: builtin/reset.c:40
msgid "mixed"
msgstr "混杂"
#: builtin/reset.c:40
msgid "soft"
msgstr "软性"
#: builtin/reset.c:40
msgid "hard"
msgstr "硬性"
#: builtin/reset.c:40
msgid "merge"
msgstr "合并"
#: builtin/reset.c:40
msgid "keep"
msgstr "保持"
#: builtin/reset.c:81
msgid "You do not have a valid HEAD."
msgstr "您没有一个有效的 HEAD。"
#: builtin/reset.c:83
msgid "Failed to find tree of HEAD."
msgstr "无法找到 HEAD 指向的树。"
#: builtin/reset.c:89
#, c-format
msgid "Failed to find tree of %s."
msgstr "无法找到 %s 指向的树。"
# 译者:汉字之间无空格,故删除%s前后空格
#: builtin/reset.c:193
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合并过程中不能做%s重置操作。"
#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
#: builtin/stash.c:613
msgid "be quiet, only report errors"
msgstr "安静模式,只报告错误"
#: builtin/reset.c:295
msgid "reset HEAD and index"
msgstr "重置 HEAD 和索引"
#: builtin/reset.c:296
msgid "reset only HEAD"
msgstr "只重置 HEAD"
#: builtin/reset.c:298 builtin/reset.c:300
msgid "reset HEAD, index and working tree"
msgstr "重置 HEAD、索引和工作区"
#: builtin/reset.c:302
msgid "reset HEAD but keep local changes"
msgstr "重置 HEAD 但保存本地变更"
#: builtin/reset.c:308
msgid "record only the fact that removed paths will be added later"
msgstr "将删除的路径标记为稍后添加"
#: builtin/reset.c:326
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "无法将 '%s' 解析为一个有效的版本。"
#: builtin/reset.c:334
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "无法将 '%s' 解析为一个有效的树对象。"
#: builtin/reset.c:343
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
#: builtin/reset.c:353
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
# 译者:汉字之间无空格,故删除%s前后空格
#: builtin/reset.c:355
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能带路径进行%s重置。"
# 译者:汉字之间无空格,故删除%s前后空格
#: builtin/reset.c:370
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "不能对纯仓库进行%s重置"
#: builtin/reset.c:374
msgid "-N can only be used with --mixed"
msgstr "-N 只能和 --mixed 同时使用"
#: builtin/reset.c:395
msgid "Unstaged changes after reset:"
msgstr "重置后取消暂存的变更:"
#: builtin/reset.c:398
#, c-format
msgid ""
"\n"
"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
"to make this the default.\n"
msgstr ""
"\n"
"重置后,枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n"
"将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n"
#: builtin/reset.c:408
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "不能重置索引文件至版本 '%s'。"
#: builtin/reset.c:412
msgid "Could not write new index file."
msgstr "不能写入新的索引文件。"
#: builtin/rev-list.c:412
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
#: builtin/rev-list.c:473
msgid "object filtering requires --objects"
msgstr "对象过滤需要 --objects"
#: builtin/rev-list.c:476
#, c-format
msgid "invalid sparse value '%s'"
msgstr "无效的稀疏值 '%s'"
#: builtin/rev-list.c:527
msgid "rev-list does not support display of notes"
msgstr "rev-list 不支持显示注解"
#: builtin/rev-list.c:530
msgid "cannot combine --use-bitmap-index with object filtering"
msgstr "不能将 --use-bitmap-index 和对象过滤组合使用"
#: builtin/rev-parse.c:408
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
#: builtin/rev-parse.c:413
msgid "keep the `--` passed as an arg"
msgstr "保持 `--` 作为一个参数传递"
#: builtin/rev-parse.c:415
msgid "stop parsing after the first non-option argument"
msgstr "遇到第一个非选项参数后停止解析"
#: builtin/rev-parse.c:418
msgid "output in stuck long form"
msgstr "以固定长格式输出"
#: builtin/rev-parse.c:551
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
" or: git rev-parse [<options>] [<arg>...]\n"
"\n"
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
" 或者git rev-parse --sq-quote [<参数>...]\n"
" 或者git rev-parse [<选项>] [<参数>...]\n"
"\n"
"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
msgstr "git revert [<选项>] <提交号>..."
#: builtin/revert.c:25
msgid "git revert <subcommand>"
msgstr "git revert <子命令>"
#: builtin/revert.c:30
msgid "git cherry-pick [<options>] <commit-ish>..."
msgstr "git cherry-pick [<选项>] <提交号>..."
#: builtin/revert.c:31
msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <子命令>"
#: builtin/revert.c:72
#, c-format
msgid "option `%s' expects a number greater than zero"
msgstr "选项 `%s' 期望一个大于零的数字"
#: builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr "%s%s 不能和 %s 同时使用"
#: builtin/revert.c:102
msgid "end revert or cherry-pick sequence"
msgstr "终止反转或拣选操作"
#: builtin/revert.c:103
msgid "resume revert or cherry-pick sequence"
msgstr "继续反转或拣选操作"
#: builtin/revert.c:104
msgid "cancel revert or cherry-pick sequence"
msgstr "取消反转或拣选操作"
#: builtin/revert.c:105
msgid "skip current commit and continue"
msgstr "跳过当前提交并继续"
#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "不要自动提交"
#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "编辑提交说明"
#: builtin/revert.c:111
msgid "parent-number"
msgstr "父编号"
#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "选择主干父提交编号"
#: builtin/revert.c:114
msgid "merge strategy"
msgstr "合并策略"
#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "合并策略的选项"
#: builtin/revert.c:125
msgid "append commit name"
msgstr "追加提交名称"
#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "保留初始化的空提交"
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "保持多余的、空的提交"
#: builtin/revert.c:232
msgid "revert failed"
msgstr "还原失败"
#: builtin/revert.c:245
msgid "cherry-pick failed"
msgstr "拣选失败"
#: builtin/rm.c:19
msgid "git rm [<options>] [--] <file>..."
msgstr "git rm [<选项>] [--] <文件>..."
#: builtin/rm.c:207
msgid ""
"the following file has staged content different from both the\n"
"file and the HEAD:"
msgid_plural ""
"the following files have staged content different from both the\n"
"file and the HEAD:"
msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
msgstr ""
"\n"
"(使用 -f 强制删除)"
#: builtin/rm.c:216
msgid "the following file has changes staged in the index:"
msgid_plural "the following files have changes staged in the index:"
msgstr[0] "下列文件索引中有变更"
msgstr[1] "下列文件索引中有变更"
#: builtin/rm.c:220 builtin/rm.c:229
msgid ""
"\n"
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
"\n"
"(使用 --cached 保留本地文件,或用 -f 强制删除)"
#: builtin/rm.c:226
msgid "the following file has local modifications:"
msgid_plural "the following files have local modifications:"
msgstr[0] "如下文件有本地修改:"
msgstr[1] "如下文件有本地修改:"
#: builtin/rm.c:242
msgid "do not list removed files"
msgstr "不列出删除的文件"
#: builtin/rm.c:243
msgid "only remove from the index"
msgstr "只从索引区删除"
#: builtin/rm.c:244
msgid "override the up-to-date check"
msgstr "忽略文件更新状态检查"
#: builtin/rm.c:245
msgid "allow recursive removal"
msgstr "允许递归删除"
#: builtin/rm.c:247
msgid "exit with a zero status even if nothing matched"
msgstr "即使没有匹配,也以零状态退出"
#: builtin/rm.c:289
msgid "please stage your changes to .gitmodules or stash them to proceed"
msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "未提供 -r 选项不会递归删除 '%s'"
#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm不能删除 %s"
#: builtin/send-pack.c:20
msgid ""
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
"[<ref>...]\n"
" --all and explicit <ref> specification are mutually exclusive."
msgstr ""
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
" --all 和明确的 <引用> 互斥。"
#: builtin/send-pack.c:163
msgid "remote name"
msgstr "远程名称"
#: builtin/send-pack.c:177
msgid "use stateless RPC protocol"
msgstr "使用无状态的 RPC 协议"
#: builtin/send-pack.c:178
msgid "read refs from stdin"
msgstr "从标准输入读取引用"
#: builtin/send-pack.c:179
msgid "print status from remote helper"
msgstr "打印来自远程 helper 的状态"
#: builtin/shortlog.c:14
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
#: builtin/shortlog.c:15
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr "git log --pretty=short | git shortlog [<选项>]"
#: builtin/shortlog.c:264
msgid "Group by committer rather than author"
msgstr "按照提交者分组而不是作者"
#: builtin/shortlog.c:266
msgid "sort output according to the number of commits per author"
msgstr "根据每个作者的提交数量排序"
#: builtin/shortlog.c:268
msgid "Suppress commit descriptions, only provides commit count"
msgstr "隐藏提交说明,只提供提交数量"
#: builtin/shortlog.c:270
msgid "Show the email address of each author"
msgstr "显示每个作者的电子邮件地址"
#: builtin/shortlog.c:271
msgid "<w>[,<i1>[,<i2>]]"
msgstr "<w>[,<i1>[,<i2>]]"
#: builtin/shortlog.c:272
msgid "Linewrap output"
msgstr "折行输出"
#: builtin/shortlog.c:301
msgid "too many arguments given outside repository"
msgstr "仓库外执行提供了太多的参数"
#: builtin/show-branch.c:13
msgid ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
#: builtin/show-branch.c:17
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
#: builtin/show-branch.c:395
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
msgstr[0] "忽略 %s无法处理 %d 个以上的引用"
msgstr[1] "忽略 %s无法处理 %d 个以上的引用"
#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "没有和 %s 匹配的引用"
#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "显示远程跟踪的和本地的分支"
#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "显示远程跟踪的分支"
#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "着色 '*!+-' 到相应的分支"
#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "显示共同祖先后的 <n> 个提交"
#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "和 more=-1 同义"
#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "不显示字符串命名"
#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "包括当前分支"
#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "以对象名字命名提交"
#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "显示可能合并的基线"
#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "显示没有任何引用的的引用"
#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "以拓扑顺序显示提交"
#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "只显示不在第一个分支上的提交"
#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "显示仅一个分支可访问的合并提交"
#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "拓扑方式排序,并尽可能地保持日期顺序"
#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<base>]"
#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
#: builtin/show-branch.c:711
msgid ""
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "未提供分支,且 HEAD 无效"
#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "选项 --reflog 需要一个分支名"
#: builtin/show-branch.c:741
#, c-format
msgid "only %d entry can be shown at one time."
msgid_plural "only %d entries can be shown at one time."
msgstr[0] "一次只能显示 %d 个条目。"
msgstr[1] "一次只能显示 %d 个条目。"
#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "无此引用 %s"
#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
msgstr[0] "不能处理 %d 个以上的版本。"
msgstr[1] "不能处理 %d 个以上的版本。"
#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "'%s' 不是一个有效的引用。"
#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
msgstr "不能找到提交 %s%s"
#: builtin/show-ref.c:12
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
msgstr ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
msgstr "git show-ref --exclude-existing[=<模式>]"
#: builtin/show-ref.c:162
msgid "only show tags (can be combined with heads)"
msgstr "只显示标签(可以和头共用)"
#: builtin/show-ref.c:163
msgid "only show heads (can be combined with tags)"
msgstr "只显示头(可以和标签共用)"
#: builtin/show-ref.c:164
msgid "stricter reference checking, requires exact ref path"
msgstr "更严格的引用检测,需要精确的引用路径"
#: builtin/show-ref.c:167 builtin/show-ref.c:169
msgid "show the HEAD reference, even if it would be filtered out"
msgstr "显示 HEAD 引用,即使被过滤掉"
#: builtin/show-ref.c:171
msgid "dereference tags into object IDs"
msgstr "转换标签到对象 ID"
#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
#: builtin/show-ref.c:179
msgid "show refs from stdin that aren't in local repository"
msgstr "显示从标准输入中读入的不在本地仓库中的引用"
#: builtin/stash.c:22 builtin/stash.c:37
msgid "git stash list [<options>]"
msgstr "git stash list [<选项>]"
#: builtin/stash.c:23 builtin/stash.c:42
msgid "git stash show [<options>] [<stash>]"
msgstr "git stash show [<选项>] [<stash>]"
#: builtin/stash.c:24 builtin/stash.c:47
msgid "git stash drop [-q|--quiet] [<stash>]"
msgstr "git stash drop [-q|--quiet] [<stash>]"
#: builtin/stash.c:25
msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
#: builtin/stash.c:26 builtin/stash.c:62
msgid "git stash branch <branchname> [<stash>]"
msgstr "git stash branch <分支名> [<stash>]"
#: builtin/stash.c:27 builtin/stash.c:67
msgid "git stash clear"
msgstr "git stash clear"
#: builtin/stash.c:28 builtin/stash.c:77
msgid ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--] [<pathspec>...]]"
msgstr ""
"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
" [--] [<路径规格>...]]"
#: builtin/stash.c:31 builtin/stash.c:84
msgid ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"
msgstr ""
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<消息>]"
#: builtin/stash.c:52
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
#: builtin/stash.c:57
msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
#: builtin/stash.c:72
msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"
#: builtin/stash.c:127
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "'%s' 不像是一个贮藏提交"
#: builtin/stash.c:147
#, c-format
msgid "Too many revisions specified:%s"
msgstr "指定了太多的版本:%s"
#: builtin/stash.c:161 git-legacy-stash.sh:548
msgid "No stash entries found."
msgstr "未发现贮藏条目。"
#: builtin/stash.c:175
#, c-format
msgid "%s is not a valid reference"
msgstr "%s 不是一个有效的引用名"
#: builtin/stash.c:224 git-legacy-stash.sh:75
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear 不支持参数"
#: builtin/stash.c:403
msgid "cannot apply a stash in the middle of a merge"
msgstr "无法在合并过程应用贮藏"
#: builtin/stash.c:414
#, c-format
msgid "could not generate diff %s^!."
msgstr "无法生成差异 %s^!."
#: builtin/stash.c:421
msgid "conflicts in index.Try without --index."
msgstr "索引中有冲突。尝试不用 --index。"
#: builtin/stash.c:427
msgid "could not save index tree"
msgstr "不能保存索引树"
#: builtin/stash.c:434
msgid "could not restore untracked files from stash"
msgstr "无法从贮藏条目中恢复未跟踪文件"
#: builtin/stash.c:448
#, c-format
msgid "Merging %s with %s"
msgstr "正在合并 %s 和 %s"
#: builtin/stash.c:458 git-legacy-stash.sh:680
msgid "Index was not unstashed."
msgstr "索引未从贮藏中恢复。"
#: builtin/stash.c:516 builtin/stash.c:615
msgid "attempt to recreate the index"
msgstr "尝试重建索引"
#: builtin/stash.c:549
#, c-format
msgid "Dropped %s (%s)"
msgstr "丢弃了 %s%s"
#: builtin/stash.c:552
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s无法丢弃贮藏条目"
#: builtin/stash.c:577
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' 不是一个贮藏引用"
#: builtin/stash.c:627 git-legacy-stash.sh:694
msgid "The stash entry is kept in case you need it again."
msgstr "贮藏条目被保留以备您再次需要。"
#: builtin/stash.c:650 git-legacy-stash.sh:712
msgid "No branch name specified"
msgstr "未指定分支名"
#: builtin/stash.c:790 builtin/stash.c:827
#, c-format
msgid "Cannot update %s with %s"
msgstr "无法用 %2$s 更新 %1$s"
#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
msgid "stash message"
msgstr "贮藏说明"
#: builtin/stash.c:818
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" 需要一个 <提交> 参数"
#: builtin/stash.c:1040 git-legacy-stash.sh:217
msgid "No changes selected"
msgstr "没有选择变更"
#: builtin/stash.c:1136 git-legacy-stash.sh:150
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
#: builtin/stash.c:1163 git-legacy-stash.sh:165
msgid "Cannot save the current index state"
msgstr "无法保存当前索引状态"
#: builtin/stash.c:1172 git-legacy-stash.sh:180
msgid "Cannot save the untracked files"
msgstr "无法保存未跟踪文件"
#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
#: git-legacy-stash.sh:213
msgid "Cannot save the current worktree state"
msgstr "无法保存当前工作区状态"
#: builtin/stash.c:1220 git-legacy-stash.sh:233
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"
#: builtin/stash.c:1269 git-legacy-stash.sh:337
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
#: builtin/stash.c:1285
msgid "Did you forget to 'git add'?"
msgstr "您是否忘了执行 'git add'"
#: builtin/stash.c:1300 git-legacy-stash.sh:345
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
#: builtin/stash.c:1307 git-legacy-stash.sh:350
msgid "Cannot initialize stash"
msgstr "无法初始化贮藏"
#: builtin/stash.c:1322 git-legacy-stash.sh:354
msgid "Cannot save the current status"
msgstr "无法保存当前状态"
#: builtin/stash.c:1327
#, c-format
msgid "Saved working directory and index state %s"
msgstr "保存工作目录和索引状态 %s"
#: builtin/stash.c:1417 git-legacy-stash.sh:384
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"
#: builtin/stash.c:1452 builtin/stash.c:1488
msgid "keep index"
msgstr "保持索引"
#: builtin/stash.c:1454 builtin/stash.c:1490
msgid "stash in patch mode"
msgstr "以补丁模式贮藏"
#: builtin/stash.c:1455 builtin/stash.c:1491
msgid "quiet mode"
msgstr "静默模式"
#: builtin/stash.c:1457 builtin/stash.c:1493
msgid "include untracked files in stash"
msgstr "贮藏中包含未跟踪文件"
#: builtin/stash.c:1459 builtin/stash.c:1495
msgid "include ignore files"
msgstr "包含忽略的文件"
#: builtin/stash.c:1555
#, c-format
msgid "could not exec %s"
msgstr "不能执行 %s"
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
msgstr "git stripspace [-s | --strip-comments]"
#: builtin/stripspace.c:19
msgid "git stripspace [-c | --comment-lines]"
msgstr "git stripspace [-c | --comment-lines]"
#: builtin/stripspace.c:37
msgid "skip and remove all lines starting with comment character"
msgstr "跳过和移除所有的注释行"
#: builtin/stripspace.c:40
msgid "prepend comment character and space to each line"
msgstr "为每一行的行首添加注释符和空格"
#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一个完整的引用名称,却得到 %s"
#: builtin/submodule--helper.c:62
msgid "submodule--helper print-default-remote takes no arguments"
msgstr "submodule--helper print-default-remote 不带参数"
#: builtin/submodule--helper.c:100
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "无法从 url '%s' 剥离一个组件"
#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
msgid "alternative anchor for relative paths"
msgstr "相对路径的替代锚记anchor"
#: builtin/submodule--helper.c:413
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
#: builtin/submodule--helper.c:651
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
#: builtin/submodule--helper.c:522
#, c-format
msgid "Entering '%s'\n"
msgstr "进入 '%s'\n"
#: builtin/submodule--helper.c:525
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
"."
msgstr ""
"对 %s 执行 run_command 返回非零值。\n"
"."
#: builtin/submodule--helper.c:547
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
"submodules of %s\n"
"."
msgstr ""
"在递归 %s 的子模组执行 run_command 时返回非零值。\n"
"."
#: builtin/submodule--helper.c:563
msgid "Suppress output of entering each submodule command"
msgstr "阻止进入每一个子模组命令的输出"
#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
msgid "Recurse into nested submodules"
msgstr "递归进入嵌套子模组中"
#: builtin/submodule--helper.c:570
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
#: builtin/submodule--helper.c:597
#, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
#: builtin/submodule--helper.c:665
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册 url"
#: builtin/submodule--helper.c:669
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "子模组 '%s'%s已对路径 '%s' 注册\n"
#: builtin/submodule--helper.c:679
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
#: builtin/submodule--helper.c:686
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册更新模式"
#: builtin/submodule--helper.c:708
msgid "Suppress output for initializing a submodule"
msgstr "阻止子模组初始化的输出"
#: builtin/submodule--helper.c:713
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<选项>] [<路径>]"
#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
#: builtin/submodule--helper.c:824
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "无法解析子模组 '%s' 的 HEAD 引用"
#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "递归子模组 '%s' 失败"
#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
msgid "Suppress submodule status output"
msgstr "阻止子模组状态输出"
#: builtin/submodule--helper.c:876
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr "使用存储在索引中的提交,而非存储在子模组 HEAD 中的提交"
#: builtin/submodule--helper.c:877
msgid "recurse into nested submodules"
msgstr "递归进入嵌套子模组中"
#: builtin/submodule--helper.c:882
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
#: builtin/submodule--helper.c:906
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路径>"
#: builtin/submodule--helper.c:970
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "为 '%s' 同步子模组 url\n"
#: builtin/submodule--helper.c:976
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "无法为子模组路径 '%s' 注册 url"
#: builtin/submodule--helper.c:990
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "无法得到子模组 '%s' 的默认远程关联"
#: builtin/submodule--helper.c:1001
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "无法为子模组 '%s' 更新远程关联"
#: builtin/submodule--helper.c:1048
msgid "Suppress output of synchronizing submodule url"
msgstr "阻止子模组 url 同步的输出"
#: builtin/submodule--helper.c:1055
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
#: builtin/submodule--helper.c:1109
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
"really want to remove it including all of its history)"
msgstr ""
"子模组工作区 '%s' 包含一个 .git 目录(如果您确需删除它及其全部历史,使用 'rm "
"-rf' 命令)"
#: builtin/submodule--helper.c:1121
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
"them"
msgstr "子模组工作区 '%s' 包含本地修改;使用 '-f' 丢弃它们"
#: builtin/submodule--helper.c:1129
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "已清除目录 '%s'\n"
#: builtin/submodule--helper.c:1131
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "无法移除子模组工作区 '%s'\n"
#: builtin/submodule--helper.c:1142
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "不能创建空的子模组目录 %s"
#: builtin/submodule--helper.c:1158
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "子模组 '%s'%s未对路径 '%s' 注册\n"
#: builtin/submodule--helper.c:1187
msgid "Remove submodule working trees even if they contain local changes"
msgstr "删除子模组工作区,即使包含本地修改"
#: builtin/submodule--helper.c:1188
msgid "Unregister all submodules"
msgstr "将所有子模组取消注册"
#: builtin/submodule--helper.c:1193
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
#: builtin/submodule--helper.c:1207
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "子模组 '%s' 不能添加仓库备选:%s"
#: builtin/submodule--helper.c:1341
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
#: builtin/submodule--helper.c:1348
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
#: builtin/submodule--helper.c:1371
msgid "where the new submodule will be cloned to"
msgstr "新的子模组将要克隆的路径"
#: builtin/submodule--helper.c:1374
msgid "name of the new submodule"
msgstr "新子模组的名称"
#: builtin/submodule--helper.c:1377
msgid "url where to clone the submodule from"
msgstr "克隆子模组的 url 地址"
#: builtin/submodule--helper.c:1385
msgid "depth for shallow clones"
msgstr "浅克隆的深度"
#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
msgid "force cloning progress"
msgstr "强制显示克隆进度"
#: builtin/submodule--helper.c:1393
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
#: builtin/submodule--helper.c:1424
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "无法克隆 '%s' 到子模组路径 '%s'"
#: builtin/submodule--helper.c:1438
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "无法得到 '%s' 的子模组目录"
#: builtin/submodule--helper.c:1474
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效"
#: builtin/submodule--helper.c:1478
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效"
#: builtin/submodule--helper.c:1571
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "子模组 '%s' 尚未初始化"
#: builtin/submodule--helper.c:1575
msgid "Maybe you want to use 'update --init'?"
msgstr "也许您想要执行 'update --init'"
#: builtin/submodule--helper.c:1605
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略过未合并的子模组 %s"
#: builtin/submodule--helper.c:1634
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略过子模组 '%s'"
#: builtin/submodule--helper.c:1778
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "克隆 '%s' 失败。按计划重试"
#: builtin/submodule--helper.c:1789
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次尝试克隆 '%s' 失败,退出"
#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
msgid "path into the working tree"
msgstr "到工作区的路径"
#: builtin/submodule--helper.c:1854
msgid "path into the working tree, across nested submodule boundaries"
msgstr "工作区中的路径,递归嵌套子模组"
#: builtin/submodule--helper.c:1858
msgid "rebase, merge, checkout or none"
msgstr "rebase、merge、checkout 或 none"
#: builtin/submodule--helper.c:1864
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "创建一个指定深度的浅克隆"
#: builtin/submodule--helper.c:1867
msgid "parallel jobs"
msgstr "并发任务"
#: builtin/submodule--helper.c:1869
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
#: builtin/submodule--helper.c:1870
msgid "don't print cloning progress"
msgstr "不要输出克隆进度"
#: builtin/submodule--helper.c:1877
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
#: builtin/submodule--helper.c:1890
msgid "bad value for update parameter"
msgstr "update 参数取值错误"
#: builtin/submodule--helper.c:1938
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
"the superproject is not on any branch"
msgstr "子模组(%s的分支配置为继承上级项目的分支但是上级项目不在任何分支上"
#: builtin/submodule--helper.c:2061
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "无法获得子模组 '%s' 的仓库句柄"
#: builtin/submodule--helper.c:2094
msgid "recurse into submodules"
msgstr "在子模组中递归"
#: builtin/submodule--helper.c:2100
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
#: builtin/submodule--helper.c:2156
msgid "check if it is safe to write to the .gitmodules file"
msgstr "检查写入 .gitmodules 文件是否安全"
#: builtin/submodule--helper.c:2159
msgid "unset the config in the .gitmodules file"
msgstr "取消 .gitmodules 文件中的设置"
#: builtin/submodule--helper.c:2164
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <名称> [<值>]"
#: builtin/submodule--helper.c:2165
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <名称>"
#: builtin/submodule--helper.c:2166
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
#: builtin/submodule--helper.c:2185 git-submodule.sh:171
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "请确认 .gitmodules 文件在工作区里"
#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支持 --super-prefix"
#: builtin/submodule--helper.c:2241
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
#: builtin/symbolic-ref.c:9
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <名称>"
#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr "不显示非符号(分离的)引用的错误信息"
#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr "删除符号引用"
#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr "缩短引用输出"
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
msgid "reason"
msgstr "原因"
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
msgid "reason of the update"
msgstr "更新的原因"
#: builtin/tag.c:25
msgid ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
"\t\t<tagname> [<head>]"
msgstr ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n"
"\t\t<标签名> [<头>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
msgstr "git tag -d <标签名>..."
#: builtin/tag.c:28
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
"points-at <object>]\n"
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
msgstr ""
"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
"at <对象>]\n"
"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<格式>] <标签名>..."
#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "未发现标签 '%s'。"
#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已删除标签 '%s'(曾为 %s\n"
#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
"Write a message for tag:\n"
" %s\n"
"Lines starting with '%c' will be ignored.\n"
msgstr ""
"\n"
"输入一个标签说明:\n"
" %s\n"
"以 '%c' 开头的行将被忽略。\n"
#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
"Write a message for tag:\n"
" %s\n"
"Lines starting with '%c' will be kept; you may remove them yourself if you "
"want to.\n"
msgstr ""
"\n"
"输入一个标签说明:\n"
" %s\n"
"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "无法签署标签"
#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "无法写标签文件"
#: builtin/tag.c:216
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
"already a tag. If you meant to tag the object that it points to, use:\n"
"\n"
"\tgit tag -f %s %s^{}"
msgstr ""
"您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n"
"对其指向的目标创建标签,使用:\n"
"\n"
"\tgit tag -f %s %s^{}"
#: builtin/tag.c:232
msgid "bad object type."
msgstr "坏的对象类型。"
#: builtin/tag.c:284
msgid "no tag message?"
msgstr "无标签说明?"
#: builtin/tag.c:291
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "标签说明被保留在 %s\n"
#: builtin/tag.c:402
msgid "list tag names"
msgstr "列出标签名称"
#: builtin/tag.c:404
msgid "print <n> lines of each tag message"
msgstr "每个标签信息打印 <n> 行"
#: builtin/tag.c:406
msgid "delete tags"
msgstr "删除标签"
#: builtin/tag.c:407
msgid "verify tags"
msgstr "验证标签"
#: builtin/tag.c:409
msgid "Tag creation options"
msgstr "标签创建选项"
#: builtin/tag.c:411
msgid "annotated tag, needs a message"
msgstr "附注标签,需要一个说明"
#: builtin/tag.c:413
msgid "tag message"
msgstr "标签说明"
#: builtin/tag.c:415
msgid "force edit of tag message"
msgstr "强制编辑标签说明"
#: builtin/tag.c:416
msgid "annotated and GPG-signed tag"
msgstr "附注并附加 GPG 签名的标签"
#: builtin/tag.c:419
msgid "use another key to sign the tag"
msgstr "使用另外的私钥签名该标签"
#: builtin/tag.c:420
msgid "replace the tag if exists"
msgstr "如果存在,替换现有的标签"
#: builtin/tag.c:421 builtin/update-ref.c:369
msgid "create a reflog"
msgstr "创建引用日志"
#: builtin/tag.c:423
msgid "Tag listing options"
msgstr "标签列表选项"
#: builtin/tag.c:424
msgid "show tag list in columns"
msgstr "以列的方式显示标签列表"
#: builtin/tag.c:425 builtin/tag.c:427
msgid "print only tags that contain the commit"
msgstr "只打印包含该提交的标签"
#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that don't contain the commit"
msgstr "只打印不包含该提交的标签"
#: builtin/tag.c:429
msgid "print only tags that are merged"
msgstr "只打印已经合并的标签"
#: builtin/tag.c:430
msgid "print only tags that are not merged"
msgstr "只打印尚未合并的标签"
#: builtin/tag.c:434
msgid "print only tags of the object"
msgstr "只打印指向该对象的标签"
#: builtin/tag.c:482
msgid "--column and -n are incompatible"
msgstr "--column 和 -n 不兼容"
#: builtin/tag.c:504
msgid "-n option is only allowed in list mode"
msgstr "-n 选项只允许用在列表显示模式"
#: builtin/tag.c:506
msgid "--contains option is only allowed in list mode"
msgstr "--contains 选项只允许用在列表显示模式"
#: builtin/tag.c:508
msgid "--no-contains option is only allowed in list mode"
msgstr "--no-contains 选项只允许用在列表显示模式"
#: builtin/tag.c:510
msgid "--points-at option is only allowed in list mode"
msgstr "--points-at 选项只允许用在列表显示模式"
#: builtin/tag.c:512
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
#: builtin/tag.c:523
msgid "only one -F or -m option is allowed."
msgstr "只允许一个 -F 或 -m 选项。"
#: builtin/tag.c:542
msgid "too many params"
msgstr "太多参数"
#: builtin/tag.c:548
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一个有效的标签名称。"
#: builtin/tag.c:553
#, c-format
msgid "tag '%s' already exists"
msgstr "标签 '%s' 已存在"
#: builtin/tag.c:584
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新标签 '%s'(曾为 %s\n"
#: builtin/unpack-objects.c:500
msgid "Unpacking objects"
msgstr "展开对象中"
#: builtin/update-index.c:83
#, c-format
msgid "failed to create directory %s"
msgstr "创建目录 %s 失败"
#: builtin/update-index.c:99
#, c-format
msgid "failed to create file %s"
msgstr "创建文件 %s 失败"
#: builtin/update-index.c:107
#, c-format
msgid "failed to delete file %s"
msgstr "删除文件 %s 失败"
#: builtin/update-index.c:114 builtin/update-index.c:220
#, c-format
msgid "failed to delete directory %s"
msgstr "删除目录 %s 失败"
#: builtin/update-index.c:139
#, c-format
msgid "Testing mtime in '%s' "
msgstr "在 '%s' 中测试 mtime "
#: builtin/update-index.c:153
msgid "directory stat info does not change after adding a new file"
msgstr "添加一个新文件后,目录的状态信息未改变"
#: builtin/update-index.c:166
msgid "directory stat info does not change after adding a new directory"
msgstr "添加一个新目录后,目录的状态信息未改变"
#: builtin/update-index.c:179
msgid "directory stat info changes after updating a file"
msgstr "更新一个文件后,目录的状态信息被修改"
#: builtin/update-index.c:190
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr "在子目录中添加文件后,目录的状态信息被修改"
#: builtin/update-index.c:201
msgid "directory stat info does not change after deleting a file"
msgstr "删除一个文件后,目录的状态信息未改变"
#: builtin/update-index.c:214
msgid "directory stat info does not change after deleting a directory"
msgstr "删除一个目录后,目录的状态信息未改变"
#: builtin/update-index.c:221
msgid " OK"
msgstr " OK"
#: builtin/update-index.c:589
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<选项>] [--] [<文件>...]"
#: builtin/update-index.c:971
msgid "continue refresh even when index needs update"
msgstr "当索引需要更新时继续刷新"
#: builtin/update-index.c:974
msgid "refresh: ignore submodules"
msgstr "刷新:忽略子模组"
#: builtin/update-index.c:977
msgid "do not ignore new files"
msgstr "不忽略新的文件"
#: builtin/update-index.c:979
msgid "let files replace directories and vice-versa"
msgstr "让文件替换目录(反之亦然)"
#: builtin/update-index.c:981
msgid "notice files missing from worktree"
msgstr "通知文件从工作区丢失"
#: builtin/update-index.c:983
msgid "refresh even if index contains unmerged entries"
msgstr "即使索引区包含未合并的条目也执行刷新"
#: builtin/update-index.c:986
msgid "refresh stat information"
msgstr "刷新统计信息"
#: builtin/update-index.c:990
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "类似于 --refresh但是忽略 assume-unchanged 设置"
#: builtin/update-index.c:994
msgid "<mode>,<object>,<path>"
msgstr "<存取模式>,<对象>,<路径>"
#: builtin/update-index.c:995
msgid "add the specified entry to the index"
msgstr "添加指定的条目到索引区"
#: builtin/update-index.c:1005
msgid "mark files as \"not changing\""
msgstr "把文件标记为 \"没有变更\""
#: builtin/update-index.c:1008
msgid "clear assumed-unchanged bit"
msgstr "清除 assumed-unchanged 位"
#: builtin/update-index.c:1011
msgid "mark files as \"index-only\""
msgstr "把文件标记为 \"仅索引\""
#: builtin/update-index.c:1014
msgid "clear skip-worktree bit"
msgstr "清除 skip-worktree 位"
#: builtin/update-index.c:1017
msgid "add to index only; do not add content to object database"
msgstr "只添加到索引区;不添加对象到对象库"
#: builtin/update-index.c:1019
msgid "remove named paths even if present in worktree"
msgstr "即使存在工作区里,也删除路径"
#: builtin/update-index.c:1021
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "携带 --stdin输入的行以 null 字符终止"
#: builtin/update-index.c:1023
msgid "read list of paths to be updated from standard input"
msgstr "从标准输入中读取需要更新的路径列表"
#: builtin/update-index.c:1027
msgid "add entries from standard input to the index"
msgstr "从标准输入添加条目到索引区"
#: builtin/update-index.c:1031
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "为指定文件重新生成第2和第3暂存区"
#: builtin/update-index.c:1035
msgid "only update entries that differ from HEAD"
msgstr "只更新与 HEAD 不同的条目"
#: builtin/update-index.c:1039
msgid "ignore files missing from worktree"
msgstr "忽略工作区丢失的文件"
#: builtin/update-index.c:1042
msgid "report actions to standard output"
msgstr "在标准输出显示操作"
#: builtin/update-index.c:1044
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(for porcelains) 忘记保存的未解决的冲突"
#: builtin/update-index.c:1048
msgid "write index in this format"
msgstr "以这种格式写入索引区"
#: builtin/update-index.c:1050
msgid "enable or disable split index"
msgstr "启用或禁用索引拆分"
#: builtin/update-index.c:1052
msgid "enable/disable untracked cache"
msgstr "启用/禁用对未跟踪文件的缓存"
#: builtin/update-index.c:1054
msgid "test if the filesystem supports untracked cache"
msgstr "测试文件系统是否支持未跟踪文件缓存"
#: builtin/update-index.c:1056
msgid "enable untracked cache without testing the filesystem"
msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
#: builtin/update-index.c:1058
msgid "write out the index even if is not flagged as changed"
msgstr "即使没有被标记为已更改,也要写出索引"
#: builtin/update-index.c:1060
msgid "enable or disable file system monitor"
msgstr "启用或禁用文件系统监控"
#: builtin/update-index.c:1062
msgid "mark files as fsmonitor valid"
msgstr "标记文件为 fsmonitor 有效"
#: builtin/update-index.c:1065
msgid "clear fsmonitor valid bit"
msgstr "清除 fsmonitor 有效位"
#: builtin/update-index.c:1168
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
"core.splitIndex 被设置为 false。如果您确实要启用索引拆分请删除或修改它。"
#: builtin/update-index.c:1177
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
"core.splitIndex 被设置为 true。如果您确实要禁用索引拆分请删除或修改它。"
#: builtin/update-index.c:1188
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
msgstr ""
"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存请删除或修"
"改它。"
#: builtin/update-index.c:1192
msgid "Untracked cache disabled"
msgstr "缓存未跟踪文件被禁用"
#: builtin/update-index.c:1200
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
msgstr ""
"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存请删除或"
"修改它。"
#: builtin/update-index.c:1204
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "缓存未跟踪文件在 '%s' 启用"
#: builtin/update-index.c:1212
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项"
#: builtin/update-index.c:1216
msgid "fsmonitor enabled"
msgstr "fsmonitor 被启用"
#: builtin/update-index.c:1219
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项"
#: builtin/update-index.c:1223
msgid "fsmonitor disabled"
msgstr "fsmonitor 被禁用"
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
#: builtin/update-ref.c:11
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
#: builtin/update-ref.c:12
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<选项>] --stdin [-z]"
#: builtin/update-ref.c:364
msgid "delete the reference"
msgstr "删除引用"
#: builtin/update-ref.c:366
msgid "update <refname> not the one it points to"
msgstr "更新 <引用名> 本身而不是它指向的引用"
#: builtin/update-ref.c:367
msgid "stdin has NUL-terminated arguments"
msgstr "标准输入有以 NUL 字符终止的参数"
#: builtin/update-ref.c:368
msgid "read updates from stdin"
msgstr "从标准输入读取更新"
#: builtin/update-server-info.c:7
msgid "git update-server-info [--force]"
msgstr "git update-server-info [--force]"
#: builtin/update-server-info.c:15
msgid "update the info files from scratch"
msgstr "从头开始更新文件信息"
#: builtin/upload-pack.c:11
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<选项>] <目录>"
#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
msgid "quit after a single request/response exchange"
msgstr "在一次单独的请求/响应之后退出"
#: builtin/upload-pack.c:25
msgid "exit immediately after initial ref advertisement"
msgstr "在初始的引用广告后立即退出"
#: builtin/upload-pack.c:27
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
msgstr "如果 <目录> 不是一个 Git 目录,不要尝试 <目录>/.git/"
#: builtin/upload-pack.c:29
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "不活动 <n> 秒钟后终止传输"
#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <提交>..."
#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr "打印提交内容"
#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
msgid "print raw gpg status output"
msgstr "打印原始 gpg 状态输出"
#: builtin/verify-pack.c:55
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
#: builtin/verify-pack.c:65
msgid "verbose"
msgstr "冗长输出"
#: builtin/verify-pack.c:67
msgid "show statistics only"
msgstr "只显示统计"
#: builtin/verify-tag.c:18
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
#: builtin/verify-tag.c:36
msgid "print tag contents"
msgstr "打印标签内容"
#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<选项>] <路径> [<提交>]"
#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<选项>]"
#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<选项>] <路径>"
#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <工作区> <新路径>"
#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<选项>]"
#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<选项>] <工作区>"
#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路径>"
#: builtin/worktree.c:61 builtin/worktree.c:899
#, c-format
msgid "failed to delete '%s'"
msgstr "删除 '%s' 失败"
#: builtin/worktree.c:80
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "删除工作区/%s不是一个有效的目录"
#: builtin/worktree.c:86
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "删除 worktrees/%sgitdir 文件不存在"
#: builtin/worktree.c:91 builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "删除 worktrees/%s无法读取 gitdir 文件 (%s)"
#: builtin/worktree.c:110
#, c-format
msgid ""
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
"%<PRIuMAX>)"
msgstr "删除工作树/%s读取过短期望 %<PRIuMAX> 字节,读取 %<PRIuMAX>"
#: builtin/worktree.c:118
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "删除 worktrees/%s无效的 gitdir 文件"
#: builtin/worktree.c:127
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "删除 worktrees/%sgitdir 文件的指向不存在"
#: builtin/worktree.c:166
msgid "report pruned working trees"
msgstr "报告清除的工作区"
#: builtin/worktree.c:168
msgid "expire working trees older than <time>"
msgstr "将早于 <时间> 的工作区过期"
#: builtin/worktree.c:235
#, c-format
msgid "'%s' already exists"
msgstr "'%s' 已经存在"
#: builtin/worktree.c:252
#, c-format
msgid "unable to re-add worktree '%s'"
msgstr "无法再次添加工作区 '%s'"
#: builtin/worktree.c:257
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
"'%s' 是一个丢失但锁定的工作区,使用\n"
"'add -f -f' 覆盖,或 'unlock' 和 'prune' 或 'remove' 清除"
#: builtin/worktree.c:259
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
"use 'add -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
"'%s' 是一个丢失但已经注册的工作区,使用\n"
"'add -f' 覆盖,或 'prune' 或 'remove' 清除"
#: builtin/worktree.c:309
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能创建目录 '%s'"
#: builtin/worktree.c:440 builtin/worktree.c:446
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "准备工作区(新分支 '%s'"
#: builtin/worktree.c:442
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "准备工作区(重置分支 '%s',之前为 %s"
#: builtin/worktree.c:451
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "准备工作区(检出 '%s'"
#: builtin/worktree.c:457
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "准备工作区(分离头指针 %s"
#: builtin/worktree.c:498
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出 <分支>,即使已经被检出到其它工作区"
#: builtin/worktree.c:501
msgid "create a new branch"
msgstr "创建一个新分支"
#: builtin/worktree.c:503
msgid "create or reset a branch"
msgstr "创建或重置一个分支"
#: builtin/worktree.c:505
msgid "populate the new working tree"
msgstr "生成新的工作区"
#: builtin/worktree.c:506
msgid "keep the new working tree locked"
msgstr "锁定新工作区"
#: builtin/worktree.c:509
msgid "set up tracking mode (see git-branch(1))"
msgstr "设置跟踪模式(参见 git-branch(1)"
#: builtin/worktree.c:512
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "尝试为新分支名匹配一个远程跟踪分支"
#: builtin/worktree.c:520
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b、-B 和 --detach 是互斥的"
#: builtin/worktree.c:581
msgid "--[no-]track can only be used if a new branch is created"
msgstr "只能在创建新分支时使用选项 --[no-]track "
#: builtin/worktree.c:681
msgid "reason for locking"
msgstr "锁定原因"
#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
#: builtin/worktree.c:927
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一个工作区"
#: builtin/worktree.c:695 builtin/worktree.c:728
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作区无法被加锁或解锁"
#: builtin/worktree.c:700
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被锁定,原因:%s"
#: builtin/worktree.c:702
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被锁定"
#: builtin/worktree.c:730
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被锁定"
#: builtin/worktree.c:771
msgid "working trees containing submodules cannot be moved or removed"
msgstr "不能移动或删除包含子模组的工作区"
#: builtin/worktree.c:779
msgid "force move even if worktree is dirty or locked"
msgstr "强制移动,即使工作区是脏的或已锁定"
#: builtin/worktree.c:802 builtin/worktree.c:929
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' 是一个主工作区"
#: builtin/worktree.c:807
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "无法从 '%s' 算出目标名称"
#: builtin/worktree.c:813
#, c-format
msgid "target '%s' already exists"
msgstr "目标 '%s' 已存在"
#: builtin/worktree.c:821
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
"无法移动一个锁定的工作区,锁定原因:%s\n"
"使用 'move -f -f' 覆盖或先解锁"
#: builtin/worktree.c:823
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
"无法移动一个锁定的工作区,\n"
"使用 'move -f -f' 覆盖或先解锁"
#: builtin/worktree.c:826
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "验证失败,无法移动工作区:%s"
#: builtin/worktree.c:831
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "移动 '%s' 到 '%s' 失败"
#: builtin/worktree.c:879
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "在 '%s' 中执行 'git status' 失败"
#: builtin/worktree.c:883
#, c-format
msgid "'%s' is dirty, use --force to delete it"
msgstr "'%s' 是脏的,使用 --force 删除"
#: builtin/worktree.c:888
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d"
#: builtin/worktree.c:911
msgid "force removal even if worktree is dirty or locked"
msgstr "强制删除,即使工作区是脏的或已锁定"
#: builtin/worktree.c:934
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
"无法删除一个锁定的工作区,锁定原因:%s\n"
"使用 'remove -f -f' 覆盖或先解锁"
#: builtin/worktree.c:936
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
"无法删除一个锁定的工作区,\n"
"使用 'remove -f -f' 覆盖或先解锁"
#: builtin/worktree.c:939
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "验证失败,无法删除工作区:%s"
#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
#: builtin/write-tree.c:28
msgid "<prefix>/"
msgstr "<前缀>/"
#: builtin/write-tree.c:29
msgid "write tree object for a subdirectory <prefix>"
msgstr "将 <前缀> 子目录内容写到一个树对象"
#: builtin/write-tree.c:31
msgid "only useful for debugging"
msgstr "只对调试有用"
#: credential-cache--daemon.c:223
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
"users may be able to read your cached credentials. Consider running:\n"
"\n"
"\tchmod 0700 %s"
msgstr ""
"您的 socket 目录权限过于宽松,其他用户可能会读取您缓存的认证信息。考虑执"
"行:\n"
"\n"
"\tchmod 0700 %s"
#: credential-cache--daemon.c:272
msgid "print debugging messages to stderr"
msgstr "调试信息输出到标准错误"
#: t/helper/test-reach.c:152
#, c-format
msgid "commit %s is not marked reachable"
msgstr "提交 %s 没有标记为可达"
#: t/helper/test-reach.c:162
msgid "too many commits marked reachable"
msgstr "太多提交标记为可达"
#: t/helper/test-serve-v2.c:7
msgid "test-tool serve-v2 [<options>]"
msgstr "test-tool serve-v2 [<选项>]"
#: t/helper/test-serve-v2.c:19
msgid "exit immediately after advertising capabilities"
msgstr "对能力广告之后立即退出"
#: git.c:27
msgid ""
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
" <command> [<args>]"
msgstr ""
"git [--version] [--help] [-C <路径>] [-c <名称>=<取值>]\n"
" [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
" <命令> [<参数>]"
#: git.c:34
msgid ""
"'git help -a' and 'git help -g' list available subcommands and some\n"
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
"to read about a specific subcommand or concept.\n"
"See 'git help git' for an overview of the system."
msgstr ""
"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
"帮助。\n"
"有关系统的概述,查看 'git help git'。"
#: git.c:186
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "没有为 --git-dir 提供目录\n"
#: git.c:200
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "没有为 --namespace 提供命名空间\n"
#: git.c:214
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "没有为 --work-tree 提供目录\n"
#: git.c:228
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "没有为 --super-prefix 提供前缀\n"
#: git.c:250
#, c-format
msgid "-c expects a configuration string\n"
msgstr "应为 -c 提供一个配置字符串\n"
#: git.c:288
#, c-format
msgid "no directory given for -C\n"
msgstr "没有为 -C 提供目录\n"
#: git.c:314
#, c-format
msgid "unknown option: %s\n"
msgstr "未知选项:%s\n"
#: git.c:360
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "在扩展别名 '%s' 时:'%s'"
#: git.c:369
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
"You can use '!git' in the alias to do this"
msgstr ""
"别名 '%s' 修改环境变量。您可以使用在别名中\n"
"使用 '!git'"
#: git.c:377
#, c-format
msgid "empty alias for %s"
msgstr "%s 的空别名"
#: git.c:380
#, c-format
msgid "recursive alias: %s"
msgstr "递归的别名:%s"
#: git.c:460
msgid "write failure on standard output"
msgstr "在标准输出写入失败"
#: git.c:462
msgid "unknown write failure on standard output"
msgstr "到标准输出的未知写入错误"
#: git.c:464
msgid "close failed on standard output"
msgstr "标准输出关闭失败"
#: git.c:793
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "检测到别名循环:'%s'的扩展未终止:%s"
#: git.c:843
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "不能作为内置命令处理 %s"
#: git.c:856
#, c-format
msgid ""
"usage: %s\n"
"\n"
msgstr ""
"用法:%s\n"
"\n"
#: git.c:876
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n"
#: git.c:888
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "运行命令 '%s' 失败:%s\n"
#: http.c:378
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "http.postbuffer 为负值,默认为 %d"
#: http.c:399
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "不支持委托控制,因为 cURL < 7.22.0"
#: http.c:408
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
#: http.c:876
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr "不支持 CURLSSLOPT_NO_REVOKE因为 cURL < 7.44.0"
#: http.c:949
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr "不支持协议限制,因为 cURL < 7.19.4"
#: http.c:1085
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端:"
#: http.c:1092
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr "无法设置 SSL 后端为 '%s'cURL: cURL 没有使用 SSL 后端构建"
#: http.c:1096
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "无法将 SSL 后端设置为 '%s':已经设置"
#: http.c:1965
#, c-format
msgid ""
"unable to update url base from redirection:\n"
" asked for: %s\n"
" redirect: %s"
msgstr ""
"不能更新重定向的 url base\n"
" 请求:%s\n"
" 重定向:%s"
#: remote-curl.c:157
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "在 push-option 取值中无效的引号:'%s'"
#: remote-curl.c:254
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs 无效:这是一个 git 仓库么?"
#: remote-curl.c:355
msgid "invalid server response; expected service, got flush packet"
msgstr "无效的服务端响应。预期服务,得到 flush 包"
#: remote-curl.c:386
#, c-format
msgid "invalid server response; got '%s'"
msgstr "无效的服务端响应,得到 '%s'"
#: remote-curl.c:446
#, c-format
msgid "repository '%s' not found"
msgstr "仓库 '%s' 未找到"
#: remote-curl.c:450
#, c-format
msgid "Authentication failed for '%s'"
msgstr "'%s' 鉴权失败"
#: remote-curl.c:454
#, c-format
msgid "unable to access '%s': %s"
msgstr "无法访问 '%s'%s"
#: remote-curl.c:460
#, c-format
msgid "redirecting to %s"
msgstr "重定向到 %s"
#: remote-curl.c:584
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "当没有设置温和处理文件结束符EOF不应该有文件结束符"
#: remote-curl.c:664
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
#: remote-curl.c:724
#, c-format
msgid "RPC failed; %s"
msgstr "RPC 失败。%s"
#: remote-curl.c:764
msgid "cannot handle pushes this big"
msgstr "不能处理这么大的推送"
#: remote-curl.c:879
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "不能压缩请求zlib 压缩错误 %d"
#: remote-curl.c:883
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "不能压缩请求zlib 结束错误 %d"
#: remote-curl.c:1014
msgid "dumb http transport does not support shallow capabilities"
msgstr "哑 http 传输不支持 shalllow 能力"
#: remote-curl.c:1028
msgid "fetch failed."
msgstr "获取失败。"
#: remote-curl.c:1076
msgid "cannot fetch by sha1 over smart http"
msgstr "无法通过智能 HTTP 获取 sha1"
#: remote-curl.c:1120 remote-curl.c:1126
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "协议错误:期望 sha/ref却得到 '%s'"
#: remote-curl.c:1138 remote-curl.c:1252
#, c-format
msgid "http transport does not support %s"
msgstr "http 传输协议不支持 %s"
#: remote-curl.c:1174
msgid "git-http-push failed"
msgstr "git-http-push 失败"
#: remote-curl.c:1360
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl用法git remote-curl <远程> [<url>]"
#: remote-curl.c:1392
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl错误读取来自 git 的命令流"
#: remote-curl.c:1399
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl尝试没有本地仓库下获取"
#: remote-curl.c:1439
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl未知的来自 git 的命令 '%s'"
#: list-objects-filter-options.h:61
msgid "args"
msgstr "参数"
#: list-objects-filter-options.h:62
msgid "object filtering"
msgstr "对象过滤"
#: parse-options.h:170
msgid "expiry-date"
msgstr "到期时间"
#: parse-options.h:184
msgid "no-op (backward compatibility)"
msgstr "空操作(向后兼容)"
#: parse-options.h:305
msgid "be more verbose"
msgstr "更加详细"
#: parse-options.h:307
msgid "be more quiet"
msgstr "更加安静"
#: parse-options.h:313
msgid "use <n> digits to display SHA-1s"
msgstr "用 <n> 位数字显示 SHA-1 哈希值"
#: parse-options.h:332
msgid "how to strip spaces and #comments from message"
msgstr "设置如何删除提交说明里的空格和#注释"
#: ref-filter.h:101
msgid "key"
msgstr "key"
#: ref-filter.h:101
msgid "field name to sort on"
msgstr "排序的字段名"
#: rerere.h:44
msgid "update the index with reused conflict resolution if possible"
msgstr "如果可能,重用冲突解决更新索引"
#: wt-status.h:67
msgid "HEAD detached at "
msgstr "头指针分离于 "
#: wt-status.h:68
msgid "HEAD detached from "
msgstr "头指针分离自 "
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "添加文件内容至索引"
#: command-list.h:51
msgid "Apply a series of patches from a mailbox"
msgstr "应用邮箱格式的系列补丁"
#: command-list.h:52
msgid "Annotate file lines with commit information"
msgstr "使用提交信息注释文件行"
#: command-list.h:53
msgid "Apply a patch to files and/or to the index"
msgstr "应用一个补丁到文件和/或索引区"
#: command-list.h:54
msgid "Import a GNU Arch repository into Git"
msgstr "将一个 GNU Arch 仓库导入到 Git"
#: command-list.h:55
msgid "Create an archive of files from a named tree"
msgstr "基于一个指定的树创建文件存档"
#: command-list.h:56
msgid "Use binary search to find the commit that introduced a bug"
msgstr "通过二分查找定位引入 bug 的提交"
#: command-list.h:57
msgid "Show what revision and author last modified each line of a file"
msgstr "显示文件每一行最后修改的版本和修改者"
#: command-list.h:58
msgid "List, create, or delete branches"
msgstr "列出、创建或删除分支"
#: command-list.h:59
msgid "Move objects and refs by archive"
msgstr "通过归档移动对象和引用"
#: command-list.h:60
msgid "Provide content or type and size information for repository objects"
msgstr "提供仓库对象的内容、类型或大小"
#: command-list.h:61
msgid "Display gitattributes information"
msgstr "显示 gitattributes 信息"
#: command-list.h:62
msgid "Debug gitignore / exclude files"
msgstr "调试 gitignore / exclude 文件"
#: command-list.h:63
msgid "Show canonical names and email addresses of contacts"
msgstr "显示联系人的规范名称和电子邮件"
#: command-list.h:64
msgid "Switch branches or restore working tree files"
msgstr "切换分支或恢复工作区文件"
#: command-list.h:65
msgid "Copy files from the index to the working tree"
msgstr "从索引拷贝文件到工作区"
#: command-list.h:66
msgid "Ensures that a reference name is well formed"
msgstr "确保引用名称格式正确"
#: command-list.h:67
msgid "Find commits yet to be applied to upstream"
msgstr "查找尚未应用到上游的提交"
#: command-list.h:68
msgid "Apply the changes introduced by some existing commits"
msgstr "应用一些现存提交引入的修改"
#: command-list.h:69
msgid "Graphical alternative to git-commit"
msgstr "git-commit 的图形替代界面"
#: command-list.h:70
msgid "Remove untracked files from the working tree"
msgstr "从工作区中删除未跟踪文件"
#: command-list.h:71
msgid "Clone a repository into a new directory"
msgstr "克隆仓库到一个新目录"
#: command-list.h:72
msgid "Display data in columns"
msgstr "以列的方式显示数据"
#: command-list.h:73
msgid "Record changes to the repository"
msgstr "记录变更到仓库"
#: command-list.h:74
msgid "Write and verify Git commit-graph files"
msgstr "写入和校验 Git 提交图文件"
#: command-list.h:75
msgid "Create a new commit object"
msgstr "创建一个新的提交对象"
#: command-list.h:76
msgid "Get and set repository or global options"
msgstr "获取和设置仓库或者全局选项"
#: command-list.h:77
msgid "Count unpacked number of objects and their disk consumption"
msgstr "计算未打包对象的数量和磁盘空间占用"
#: command-list.h:78
msgid "Retrieve and store user credentials"
msgstr "检索和存储用户密码"
#: command-list.h:79
msgid "Helper to temporarily store passwords in memory"
msgstr "在内存中临时存储密码的助手"
#: command-list.h:80
msgid "Helper to store credentials on disk"
msgstr "在磁盘存储密码的助手"
#: command-list.h:81
msgid "Export a single commit to a CVS checkout"
msgstr "将一个提交导出到 CVS 检出中"
#: command-list.h:82
msgid "Salvage your data out of another SCM people love to hate"
msgstr "从另外一个人们爱恨的配置管理系统中拯救你的数据"
#: command-list.h:83
msgid "A CVS server emulator for Git"
msgstr "Git 的一个 CVS 服务模拟器"
#: command-list.h:84
msgid "A really simple server for Git repositories"
msgstr "一个非常简单的 Git 仓库服务器"
#: command-list.h:85
msgid "Give an object a human readable name based on an available ref"
msgstr "基于一个现存的引用为一个对象起一个可读的名称"
#: command-list.h:86
msgid "Show changes between commits, commit and working tree, etc"
msgstr "显示提交之间、提交和工作区之间等的差异"
#: command-list.h:87
msgid "Compares files in the working tree and the index"
msgstr "比较工作区和索引区中的文件"
#: command-list.h:88
msgid "Compare a tree to the working tree or index"
msgstr "将一个树和工作区或索引做比较"
#: command-list.h:89
msgid "Compares the content and mode of blobs found via two tree objects"
msgstr "比较两个树对象的文件内容和模式"
#: command-list.h:90
msgid "Show changes using common diff tools"
msgstr "使用常见的差异工具显示更改"
#: command-list.h:91
msgid "Git data exporter"
msgstr "Git 数据导出器"
#: command-list.h:92
msgid "Backend for fast Git data importers"
msgstr "Git 快速数据导入器后端"
#: command-list.h:93
msgid "Download objects and refs from another repository"
msgstr "从另外一个仓库下载对象和引用"
#: command-list.h:94
msgid "Receive missing objects from another repository"
msgstr "从另一个仓库获取缺失的对象"
#: command-list.h:95
msgid "Rewrite branches"
msgstr "重写分支"
#: command-list.h:96
msgid "Produce a merge commit message"
msgstr "生成一个合并提交信息"
#: command-list.h:97
msgid "Output information on each ref"
msgstr "对每一个引用输出信息 "
#: command-list.h:98
msgid "Prepare patches for e-mail submission"
msgstr "准备电子邮件提交的补丁"
#: command-list.h:99
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr "验证仓库中对象的连通性和有效性"
#: command-list.h:100
msgid "Cleanup unnecessary files and optimize the local repository"
msgstr "清除不必要的文件和优化本地仓库"
#: command-list.h:101
msgid "Extract commit ID from an archive created using git-archive"
msgstr "从 git-archive 创建的归档文件中提取提交 ID"
#: command-list.h:102
msgid "Print lines matching a pattern"
msgstr "输出和模式匹配的行"
#: command-list.h:103
msgid "A portable graphical interface to Git"
msgstr "一个便携的 Git 图形客户端"
#: command-list.h:104
msgid "Compute object ID and optionally creates a blob from a file"
msgstr "从一个文件计算对象 ID并可以创建 blob 数据对象"
#: command-list.h:105
msgid "Display help information about Git"
msgstr "显示 Git 的帮助信息"
#: command-list.h:106
msgid "Server side implementation of Git over HTTP"
msgstr "Git HTTP 协议的服务端实现"
#: command-list.h:107
msgid "Download from a remote Git repository via HTTP"
msgstr "通过 HTTP 从远程 Git 仓库下载"
#: command-list.h:108
msgid "Push objects over HTTP/DAV to another repository"
msgstr "通过 HTTP/DAV 推送对象另一个仓库"
#: command-list.h:109
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr "从标准输入将一组补丁发送到IMAP文件夹"
#: command-list.h:110
msgid "Build pack index file for an existing packed archive"
msgstr "从一个现存的包存档文件创建包索引"
#: command-list.h:111
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
#: command-list.h:112
msgid "Instantly browse your working repository in gitweb"
msgstr "在 gitweb 中即时浏览您的工作仓库"
#: command-list.h:113
msgid "Add or parse structured information in commit messages"
msgstr "添加或解析提交说明中的结构化信息"
#: command-list.h:114
msgid "The Git repository browser"
msgstr "Git 仓库浏览器"
#: command-list.h:115
msgid "Show commit logs"
msgstr "显示提交日志"
#: command-list.h:116
msgid "Show information about files in the index and the working tree"
msgstr "显示索引和工作区中文件的信息"
#: command-list.h:117
msgid "List references in a remote repository"
msgstr "显示一个远程仓库的引用"
#: command-list.h:118
msgid "List the contents of a tree object"
msgstr "显示一个树对象的内容"
#: command-list.h:119
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "从单个电子邮件中提取补丁和作者身份"
#: command-list.h:120
msgid "Simple UNIX mbox splitter program"
msgstr "简单的 UNIX mbox 邮箱切分程序"
#: command-list.h:121
msgid "Join two or more development histories together"
msgstr "合并两个或更多开发历史"
#: command-list.h:122
msgid "Find as good common ancestors as possible for a merge"
msgstr "为了合并查找尽可能好的公共祖先提交"
#: command-list.h:123
msgid "Run a three-way file merge"
msgstr "运行一个三路文件合并"
#: command-list.h:124
msgid "Run a merge for files needing merging"
msgstr "对于需要合并的文件执行合并"
#: command-list.h:125
msgid "The standard helper program to use with git-merge-index"
msgstr "与 git-merge-index 一起使用的标准向导程序"
#: command-list.h:126
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr "运行合并冲突解决工具以解决合并冲突"
#: command-list.h:127
msgid "Show three-way merge without touching index"
msgstr "显示三路合并而不动索引"
#: command-list.h:128
msgid "Write and verify multi-pack-indexes"
msgstr "写入和校验多包索引"
#: command-list.h:129
msgid "Creates a tag object"
msgstr "创建一个标签对象"
#: command-list.h:130
msgid "Build a tree-object from ls-tree formatted text"
msgstr "基于 ls-tree 的格式化文本创建一个树对象"
#: command-list.h:131
msgid "Move or rename a file, a directory, or a symlink"
msgstr "移动或重命名一个文件、目录或符号链接"
# 查找给定版本的符号名称
#: command-list.h:132
msgid "Find symbolic names for given revs"
msgstr "查找给定版本的符号名称"
#: command-list.h:133
msgid "Add or inspect object notes"
msgstr "添加或检查对象注释"
#: command-list.h:134
msgid "Import from and submit to Perforce repositories"
msgstr "导入和提交到 Perforce 仓库中"
#: command-list.h:135
msgid "Create a packed archive of objects"
msgstr "创建对象的存档包"
#: command-list.h:136
msgid "Find redundant pack files"
msgstr "查找冗余的包文件"
#: command-list.h:137
msgid "Pack heads and tags for efficient repository access"
msgstr "打包头和标签以实现高效的仓库访问"
#: command-list.h:138
msgid "Routines to help parsing remote repository access parameters"
msgstr "帮助解析远程仓库访问参数的例程"
#: command-list.h:139
msgid "Compute unique ID for a patch"
msgstr "计算一个补丁的唯一 ID"
#: command-list.h:140
msgid "Prune all unreachable objects from the object database"
msgstr "删除对象库中所有不可达对象"
#: command-list.h:141
msgid "Remove extra objects that are already in pack files"
msgstr "删除已经在包文件中的多余对象"
#: command-list.h:142
msgid "Fetch from and integrate with another repository or a local branch"
msgstr "获取并整合另外的仓库或一个本地分支"
#: command-list.h:143
msgid "Update remote refs along with associated objects"
msgstr "更新远程引用和相关的对象"
#: command-list.h:144
msgid "Applies a quilt patchset onto the current branch"
msgstr "将一个 quilt 补丁集应用到当前分支。"
#: command-list.h:145
msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr "比较两个提交范围(如一个分支的两个版本)"
#: command-list.h:146
msgid "Reads tree information into the index"
msgstr "将树信息读取到索引"
#: command-list.h:147
msgid "Reapply commits on top of another base tip"
msgstr "在另一个分支上重新应用提交"
#: command-list.h:148
msgid "Receive what is pushed into the repository"
msgstr "接收推送到仓库中的对象"
#: command-list.h:149
msgid "Manage reflog information"
msgstr "管理 reflog 信息"
#: command-list.h:150
msgid "Manage set of tracked repositories"
msgstr "管理已跟踪仓库"
#: command-list.h:151
msgid "Pack unpacked objects in a repository"
msgstr "打包仓库中未打包对象"
#: command-list.h:152
msgid "Create, list, delete refs to replace objects"
msgstr "创建、列出、删除对象替换引用"
#: command-list.h:153
msgid "Generates a summary of pending changes"
msgstr "生成待定更改的摘要"
#: command-list.h:154
msgid "Reuse recorded resolution of conflicted merges"
msgstr "重用冲突合并的解决方案记录"
#: command-list.h:155
msgid "Reset current HEAD to the specified state"
msgstr "重置当前 HEAD 到指定状态"
#: command-list.h:156
msgid "Restore working tree files"
msgstr "恢复工作区文件"
#: command-list.h:157
msgid "Revert some existing commits"
msgstr "回退一些现存提交"
#: command-list.h:158
msgid "Lists commit objects in reverse chronological order"
msgstr "按时间顺序列出提交对象"
#: command-list.h:159
msgid "Pick out and massage parameters"
msgstr "选出并处理参数"
#: command-list.h:160
msgid "Remove files from the working tree and from the index"
msgstr "从工作区和索引中删除文件"
#: command-list.h:161
msgid "Send a collection of patches as emails"
msgstr "通过电子邮件发送一组补丁"
#: command-list.h:162
msgid "Push objects over Git protocol to another repository"
msgstr "使用 Git 协议推送对象到另一个仓库"
#: command-list.h:163
msgid "Restricted login shell for Git-only SSH access"
msgstr "只允许 Git SSH 访问的受限登录shell"
#: command-list.h:164
msgid "Summarize 'git log' output"
msgstr "'git log' 输出摘要"
#: command-list.h:165
msgid "Show various types of objects"
msgstr "显示各种类型的对象"
#: command-list.h:166
msgid "Show branches and their commits"
msgstr "显示分支和提交"
#: command-list.h:167
msgid "Show packed archive index"
msgstr "显示打包归档索引"
#: command-list.h:168
msgid "List references in a local repository"
msgstr "显示本地仓库中的引用"
#: command-list.h:169
msgid "Git's i18n setup code for shell scripts"
msgstr "为 shell 脚本准备的 Git 国际化设置代码"
#: command-list.h:170
msgid "Common Git shell script setup code"
msgstr "常用的 Git shell 脚本设置代码"
#: command-list.h:171
msgid "Stash the changes in a dirty working directory away"
msgstr "贮藏脏工作区中的修改"
#: command-list.h:172
msgid "Add file contents to the staging area"
msgstr "将文件内容添加到索引"
#: command-list.h:173
msgid "Show the working tree status"
msgstr "显示工作区状态"
#: command-list.h:174
msgid "Remove unnecessary whitespace"
msgstr "删除不必要的空白字符"
#: command-list.h:175
msgid "Initialize, update or inspect submodules"
msgstr "初始化、更新或检查子模组"
#: command-list.h:176
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Subersion 仓库和 Git 之间的双向操作"
#: command-list.h:177
msgid "Switch branches"
msgstr "切换分支"
#: command-list.h:178
msgid "Read, modify and delete symbolic refs"
msgstr "读取、修改和删除符号引用"
#: command-list.h:179
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
#: command-list.h:180
msgid "Creates a temporary file with a blob's contents"
msgstr "用 blob 数据对象的内容创建一个临时文件"
#: command-list.h:181
msgid "Unpack objects from a packed archive"
msgstr "从打包文件中解压缩对象"
#: command-list.h:182
msgid "Register file contents in the working tree to the index"
msgstr "将工作区的文件内容注册到索引"
#: command-list.h:183
msgid "Update the object name stored in a ref safely"
msgstr "安全地更新存储于引用中的对象名称"
#: command-list.h:184
msgid "Update auxiliary info file to help dumb servers"
msgstr "更新辅助信息文件以帮助哑协议服务"
#: command-list.h:185
msgid "Send archive back to git-archive"
msgstr "将存档发送回 git-archive"
#: command-list.h:186
msgid "Send objects packed back to git-fetch-pack"
msgstr "将对象压缩包发送回 git-fetch-pack"
#: command-list.h:187
msgid "Show a Git logical variable"
msgstr "显示一个Git逻辑变量"
#: command-list.h:188
msgid "Check the GPG signature of commits"
msgstr "检查 GPG 提交签名"
#: command-list.h:189
msgid "Validate packed Git archive files"
msgstr "校验打包的Git存仓文件"
#: command-list.h:190
msgid "Check the GPG signature of tags"
msgstr "检查标签的 GPG 签名"
#: command-list.h:191
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Git web 界面Git 仓库的 web 前端)"
#: command-list.h:192
msgid "Show logs with difference each commit introduces"
msgstr "显示每一个提交引入的差异日志"
#: command-list.h:193
msgid "Manage multiple working trees"
msgstr "管理多个工作区"
#: command-list.h:194
msgid "Create a tree object from the current index"
msgstr "从当前索引创建一个树对象"
#: command-list.h:195
msgid "Defining attributes per path"
msgstr "定义路径的属性"
#: command-list.h:196
msgid "Git command-line interface and conventions"
msgstr "Git 命令行界面和约定"
#: command-list.h:197
msgid "A Git core tutorial for developers"
msgstr "面向开发人员的 Git 核心教程"
#: command-list.h:198
msgid "Git for CVS users"
msgstr "适合 CVS 用户的 Git 帮助"
#: command-list.h:199
msgid "Tweaking diff output"
msgstr "调整差异输出"
#: command-list.h:200
msgid "A useful minimum set of commands for Everyday Git"
msgstr "每一天 Git 的一组有用的最小命令集合"
#: command-list.h:201
msgid "A Git Glossary"
msgstr "Git 词汇表"
#: command-list.h:202
msgid "Hooks used by Git"
msgstr "Git 使用的钩子"
#: command-list.h:203
msgid "Specifies intentionally untracked files to ignore"
msgstr "忽略指定的未跟踪文件"
#: command-list.h:204
msgid "Defining submodule properties"
msgstr "定义子模组属性"
#: command-list.h:205
msgid "Git namespaces"
msgstr "Git 名字空间"
#: command-list.h:206
msgid "Git Repository Layout"
msgstr "Git 仓库布局"
#: command-list.h:207
msgid "Specifying revisions and ranges for Git"
msgstr "指定 Git 的版本和版本范围"
#: command-list.h:208
msgid "A tutorial introduction to Git: part two"
msgstr "一个 Git 教程:第二部分"
#: command-list.h:209
msgid "A tutorial introduction to Git"
msgstr "一个 Git 教程"
#: command-list.h:210
msgid "An overview of recommended workflows with Git"
msgstr "Git 推荐的工作流概览"
#: git-bisect.sh:54
msgid "You need to start by \"git bisect start\""
msgstr "您需要执行 \"git bisect start\" 来开始"
# 译者:注意保持句尾空格
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
#: git-bisect.sh:60
msgid "Do you want me to do it for you [Y/n]? "
msgstr "您想让我为您这样做么[Y/n] "
#: git-bisect.sh:101
#, sh-format
msgid "Bad rev input: $arg"
msgstr "坏的输入版本:$arg"
#: git-bisect.sh:121
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "坏的输入版本:$bisected_head"
#: git-bisect.sh:130
#, sh-format
msgid "Bad rev input: $rev"
msgstr "坏的输入版本:$rev"
#: git-bisect.sh:139
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
#: git-bisect.sh:209
msgid "No logfile given"
msgstr "未提供日志文件"
#: git-bisect.sh:210
#, sh-format
msgid "cannot read $file for replaying"
msgstr "不能读取 $file 来重放"
#: git-bisect.sh:232
msgid "?? what are you talking about?"
msgstr "?? 您在说什么?"
#: git-bisect.sh:241
msgid "bisect run failed: no command provided."
msgstr "二分查找运行失败:没有提供命令。"
#: git-bisect.sh:246
#, sh-format
msgid "running $command"
msgstr "运行 $command"
#: git-bisect.sh:253
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
"二分查找运行失败:\n"
"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
#: git-bisect.sh:279
msgid "bisect run cannot continue any more"
msgstr "二分查找不能继续运行"
#: git-bisect.sh:285
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
"二分查找运行失败:\n"
"'bisect_state $state' 退出码为 $res"
#: git-bisect.sh:292
msgid "bisect run success"
msgstr "二分查找运行成功"
#: git-bisect.sh:300
msgid "We are not bisecting."
msgstr "我们没有在二分查找。"
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
"merge"
msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
#: git-merge-octopus.sh:61
msgid "Automated merge did not work."
msgstr "自动合并未生效。"
#: git-merge-octopus.sh:62
msgid "Should not be doing an octopus."
msgstr "不应该执行章鱼式合并。"
#: git-merge-octopus.sh:73
#, sh-format
msgid "Unable to find common commit with $pretty_name"
msgstr "无法找到和 $pretty_name 的基线提交"
#: git-merge-octopus.sh:77
#, sh-format
msgid "Already up to date with $pretty_name"
msgstr "已经和 $pretty_name 保持一致"
#: git-merge-octopus.sh:89
#, sh-format
msgid "Fast-forwarding to: $pretty_name"
msgstr "快进至:$pretty_name"
#: git-merge-octopus.sh:97
#, sh-format
msgid "Trying simple merge with $pretty_name"
msgstr "尝试和 $pretty_name 的简单合并"
#: git-merge-octopus.sh:102
msgid "Simple merge did not work, trying automatic merge."
msgstr "简单合并未生效,尝试自动合并。"
#: git-legacy-stash.sh:220
msgid "Cannot remove temporary index (can't happen)"
msgstr "无法删除临时索引(不应发生)"
#: git-legacy-stash.sh:271
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "无法用 $w_commit 更新 $ref_stash"
#: git-legacy-stash.sh:323
#, sh-format
msgid "error: unknown option for 'stash push': $option"
msgstr "错误:'stash push' 的未知选项:$option"
#: git-legacy-stash.sh:355
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "保存工作目录和索引状态 $stash_msg"
#: git-legacy-stash.sh:535
#, sh-format
msgid "unknown option: $opt"
msgstr "未知选项: $opt"
#: git-legacy-stash.sh:555
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "指定了太多的版本:$REV"
#: git-legacy-stash.sh:570
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference 不是一个有效的引用"
#: git-legacy-stash.sh:598
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' 不是贮藏式提交"
#: git-legacy-stash.sh:609
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' 不是一个贮藏引用"
#: git-legacy-stash.sh:617
msgid "unable to refresh index"
msgstr "无法刷新索引"
#: git-legacy-stash.sh:621
msgid "Cannot apply a stash in the middle of a merge"
msgstr "无法在合并过程应用贮藏"
#: git-legacy-stash.sh:629
msgid "Conflicts in index. Try without --index."
msgstr "索引中有冲突。尝试不使用 --index。"
#: git-legacy-stash.sh:631
msgid "Could not save index tree"
msgstr "不能保存索引树"
#: git-legacy-stash.sh:640
msgid "Could not restore untracked files from stash entry"
msgstr "无法从贮藏条目中恢复未跟踪文件"
#: git-legacy-stash.sh:665
msgid "Cannot unstage modified files"
msgstr "无法将修改的文件取消暂存"
#: git-legacy-stash.sh:703
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "丢弃了 ${REV} ($s)"
#: git-legacy-stash.sh:704
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}:无法丢弃贮藏条目"
#: git-legacy-stash.sh:791
msgid "(To restore them type \"git stash apply\")"
msgstr "(为恢复数据输入 \"git stash apply\""
#: git-submodule.sh:200
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "只能在工作区的顶级目录中使用相对路径"
#: git-submodule.sh:210
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "仓库 URL'$repo' 必须是绝对路径或以 ./|../ 起始"
#: git-submodule.sh:229
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' 已经存在于索引中"
#: git-submodule.sh:232
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
#: git-submodule.sh:239
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr "'$sm_path' 没有检出的提交"
#: git-submodule.sh:245
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
"$sm_path\n"
"Use -f if you really want to add it."
msgstr ""
"以下路径被您的一个 .gitignore 文件所忽略:\n"
"$sm_path\n"
"如果您确实想添加它,使用 -f 参数。"
#: git-submodule.sh:268
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "添加位于 '$sm_path' 的现存仓库到索引"
#: git-submodule.sh:270
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
#: git-submodule.sh:278
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
#: git-submodule.sh:280
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
" $realrepo\n"
"use the '--force' option. If the local git directory is not the correct "
"repo\n"
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
"如果您想要重用这个本地 git 目录而非重新克隆自\n"
" $realrepo\n"
"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
"或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
#: git-submodule.sh:286
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "激活本地 git 目录到子模组 '$sm_name'。"
#: git-submodule.sh:298
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "不能检出子模组 '$sm_path'"
#: git-submodule.sh:303
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "无法添加子模组 '$sm_path'"
#: git-submodule.sh:312
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册子模组 '$sm_path'"
#: git-submodule.sh:573
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
#: git-submodule.sh:583
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
#: git-submodule.sh:588
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
#: git-submodule.sh:606
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
"$sha1:"
msgstr "无法在子模组路径 '$displaypath' 中获取,尝试直接获取 $sha1"
#: git-submodule.sh:612
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
"获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
#: git-submodule.sh:619
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "子模组路径 '$displaypath':检出 '$sha1'"
#: git-submodule.sh:624
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
#: git-submodule.sh:625
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
#: git-submodule.sh:630
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
#: git-submodule.sh:636
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
#: git-submodule.sh:637
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "子模组 '$displaypath''$command $sha1'"
#: git-submodule.sh:668
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "无法递归进子模组路径 '$displaypath'"
#: git-submodule.sh:830
msgid "The --cached option cannot be used with the --files option"
msgstr "选项 --cached 不能和选项 --files 同时使用"
#: git-submodule.sh:882
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "意外的模式 $mod_dst"
# 译者:注意保持前导空格
#: git-submodule.sh:902
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 警告:$display_name 未包含提交 $sha1_src"
# 译者:注意保持前导空格
#: git-submodule.sh:905
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 警告:$display_name 未包含提交 $sha1_dst"
# 译者:注意保持前导空格
#: git-submodule.sh:908
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
#: git-parse-remote.sh:89
#, sh-format
msgid "See git-${cmd}(1) for details."
msgstr "详见 git-${cmd}(1)。"
#: git-rebase--preserve-merges.sh:109
msgid "Applied autostash."
msgstr "已应用 autostash。"
#: git-rebase--preserve-merges.sh:112
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "不能存储 $stash_sha1"
#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "变基中($new_count/$total"
#: git-rebase--preserve-merges.sh:207
msgid ""
"\n"
"Commands:\n"
"p, pick <commit> = use commit\n"
"r, reword <commit> = use commit, but edit the commit message\n"
"e, edit <commit> = use commit, but stop for amending\n"
"s, squash <commit> = use commit, but meld into previous commit\n"
"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
"x, exec <commit> = run command (the rest of the line) using shell\n"
"d, drop <commit> = remove commit\n"
"l, label <label> = label current HEAD with a name\n"
"t, reset <label> = reset HEAD to a label\n"
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
". create a merge commit using the original merge commit's\n"
". message (or the oneline, if no original merge commit was\n"
". specified). Use -c <commit> to reword the commit message.\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
"\n"
"命令:\n"
"p, pick <提交> = 使用提交\n"
"r, reword <提交> = 使用提交,但修改提交说明\n"
"e, edit <提交> = 使用提交,但停下来修补\n"
"s, squash <提交> = 使用提交,但融合到前一个提交\n"
"f, fixup <提交> = 类似于 \"squash\",但丢弃提交说明日志\n"
"x, exec <命令> = 使用 shell 运行命令(此行剩余部分)\n"
"d, drop <提交> = 删除提交\n"
"l, label <标签> = 为当前 HEAD 打上标签\n"
"t, reset <标签> = 重置 HEAD 到该标签\n"
"m, merge [-C <提交> | -c <提交>] <标签> [# <oneline>]\n"
". 创建一个合并提交,并使用原始的合并提交说明(如果没有指定\n"
". 原始提交,使用注释部分的 oneline 作为提交说明)。使用\n"
". -c <提交> 可以编辑提交说明。\n"
"\n"
"可以对这些行重新排序,将从上至下执行。\n"
#: git-rebase--preserve-merges.sh:270
#, sh-format
msgid ""
"You can amend the commit now, with\n"
"\n"
"\tgit commit --amend $gpg_sign_opt_quoted\n"
"\n"
"Once you are satisfied with your changes, run\n"
"\n"
"\tgit rebase --continue"
msgstr ""
"您现在可以修补这个提交,使用\n"
"\n"
"\tgit commit --amend $gpg_sign_opt_quoted\n"
"\n"
"当您对变更感到满意,执行\n"
"\n"
"\tgit rebase --continue"
#: git-rebase--preserve-merges.sh:295
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1不是一个可以被拣选的提交"
#: git-rebase--preserve-merges.sh:334
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "无效的提交名:$sha1"
#: git-rebase--preserve-merges.sh:364
msgid "Cannot write current commit's replacement sha1"
msgstr "不能写入当前提交的替代 sha1"
#: git-rebase--preserve-merges.sh:415
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "快进到 $sha1"
#: git-rebase--preserve-merges.sh:417
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "不能快进到 $sha1"
#: git-rebase--preserve-merges.sh:426
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "不能移动 HEAD 到 $first_parent"
#: git-rebase--preserve-merges.sh:431
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "拒绝压缩一个合并:$sha1"
#: git-rebase--preserve-merges.sh:449
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "无法重做合并 $sha1"
#: git-rebase--preserve-merges.sh:458
#, sh-format
msgid "Could not pick $sha1"
msgstr "不能拣选 $sha1"
#: git-rebase--preserve-merges.sh:467
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "这是提交说明 #${n}"
#: git-rebase--preserve-merges.sh:472
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "提交说明 #${n} 将被跳过:"
#: git-rebase--preserve-merges.sh:483
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "这是一个 $count 个提交的组合。"
msgstr[1] "这是一个 $count 个提交的组合。"
#: git-rebase--preserve-merges.sh:492
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "不能写入 $fixup_msg"
#: git-rebase--preserve-merges.sh:495
msgid "This is a combination of 2 commits."
msgstr "这是一个 2 个提交的组合。"
#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
#: git-rebase--preserve-merges.sh:582
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "不能应用 $sha1... $rest"
#: git-rebase--preserve-merges.sh:611
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
"This is most likely due to an empty commit message, or the pre-commit hook\n"
"failed. If the pre-commit hook failed, you may need to resolve the issue "
"before\n"
"you are able to reword the commit."
msgstr ""
"不能在成功拣选 $sha1... $rest 之后修补提交\n"
"这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
"钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
#: git-rebase--preserve-merges.sh:626
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "停止在 $sha1_abbrev... $rest"
#: git-rebase--preserve-merges.sh:641
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "没有父提交的情况下不能 '$squash_style'"
#: git-rebase--preserve-merges.sh:683
#, sh-format
msgid "Executing: $rest"
msgstr "执行:$rest"
#: git-rebase--preserve-merges.sh:691
#, sh-format
msgid "Execution failed: $rest"
msgstr "执行失败:$rest"
#: git-rebase--preserve-merges.sh:693
msgid "and made changes to the index and/or the working tree"
msgstr "并且修改索引和/或工作区"
# 译者:注意保持前导空格
#: git-rebase--preserve-merges.sh:695
msgid ""
"You can fix the problem, and then run\n"
"\n"
"\tgit rebase --continue"
msgstr ""
"您可以解决这个问题,然后运行\n"
"\n"
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
#: git-rebase--preserve-merges.sh:708
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
"but left changes to the index and/or the working tree\n"
"Commit or stash your changes, and then run\n"
"\n"
"\tgit rebase --continue"
msgstr ""
"执行成功:$rest\n"
"但是在索引和/或工作区中存在变更。提交或贮藏修改,然后运行\n"
"\n"
"\tgit rebase --continue"
#: git-rebase--preserve-merges.sh:719
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "未知命令:$command $sha1 $rest"
#: git-rebase--preserve-merges.sh:720
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "要修改请使用命令 'git rebase --edit-todo'。"
#: git-rebase--preserve-merges.sh:755
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "成功变基并更新 $head_name。"
#: git-rebase--preserve-merges.sh:812
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
#: git-rebase--preserve-merges.sh:817
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
"If these changes are meant to be\n"
"squashed into the previous commit, run:\n"
"\n"
" git commit --amend $gpg_sign_opt_quoted\n"
"\n"
"If they are meant to go into a new commit, run:\n"
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
"In both cases, once you're done, continue with:\n"
"\n"
" git rebase --continue\n"
msgstr ""
"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
"\n"
" git commit --amend $gpg_sign_opt_quoted\n"
"\n"
"如果这些变更要形成一个新提交,执行:\n"
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
"无论哪种情况,当您完成提交,继续执行:\n"
"\n"
" git rebase --continue\n"
#: git-rebase--preserve-merges.sh:834
msgid "Error trying to find the author identity to amend commit"
msgstr "在修补提交中查找作者信息时遇到错误"
#: git-rebase--preserve-merges.sh:839
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
msgid "Could not commit staged changes."
msgstr "不能提交暂存的修改。"
#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
msgid "Could not execute editor"
msgstr "无法运行编辑器"
#: git-rebase--preserve-merges.sh:900
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "不能检出 $switch_to"
#: git-rebase--preserve-merges.sh:907
msgid "No HEAD?"
msgstr "没有 HEAD"
#: git-rebase--preserve-merges.sh:908
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "不能创建临时 $state_dir"
#: git-rebase--preserve-merges.sh:911
msgid "Could not mark as interactive"
msgstr "不能标记为交互式"
#: git-rebase--preserve-merges.sh:943
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "变基 $shortrevisions 到 $shortonto$todocount 个提交)"
msgstr[1] "变基 $shortrevisions 到 $shortonto$todocount 个提交)"
#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
msgid "Could not init rewritten commits"
msgstr "不能对重写提交进行初始化"
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
msgid "usage: $dashless $USAGE"
msgstr "用法:$dashless $USAGE"
#: git-sh-setup.sh:191
#, sh-format
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
msgstr "不能切换目录到 $cdup工作区的顶级目录"
#: git-sh-setup.sh:200 git-sh-setup.sh:207
#, sh-format
msgid "fatal: $program_name cannot be used without a working tree."
msgstr "致命错误:$program_name 不能在没有工作区的情况下使用"
#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
msgstr "不能变基:您有未暂存的变更。"
#: git-sh-setup.sh:224
msgid "Cannot rewrite branches: You have unstaged changes."
msgstr "不能重写分支:您有未暂存的变更。"
#: git-sh-setup.sh:227
msgid "Cannot pull with rebase: You have unstaged changes."
msgstr "无法通过变基方式拉取:您有未暂存的变更。"
#: git-sh-setup.sh:230
#, sh-format
msgid "Cannot $action: You have unstaged changes."
msgstr "不能 $action您有未暂存的变更。"
#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr "不能变基:您的索引中包含未提交的变更。"
#: git-sh-setup.sh:246
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
#: git-sh-setup.sh:249
#, sh-format
msgid "Cannot $action: Your index contains uncommitted changes."
msgstr "不能 $action您的索引中包含未提交的变更。"
#: git-sh-setup.sh:253
msgid "Additionally, your index contains uncommitted changes."
msgstr "而且您的索引中包含未提交的变更。"
#: git-sh-setup.sh:373
msgid "You need to run this command from the toplevel of the working tree."
msgstr "您需要在工作区的顶级目录中运行这个命令。"
#: git-sh-setup.sh:378
msgid "Unable to determine absolute path of git directory"
msgstr "不能确定 git 目录的绝对路径"
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
#: git-add--interactive.perl:210
#, perl-format
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
#: git-add--interactive.perl:211
msgid "staged"
msgstr "缓存"
#: git-add--interactive.perl:211
msgid "unstaged"
msgstr "未缓存"
#: git-add--interactive.perl:267 git-add--interactive.perl:292
msgid "binary"
msgstr "二进制"
#: git-add--interactive.perl:276 git-add--interactive.perl:330
msgid "nothing"
msgstr "无"
#: git-add--interactive.perl:312 git-add--interactive.perl:327
msgid "unchanged"
msgstr "没有修改"
#: git-add--interactive.perl:623
#, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "增加了 %d 个路径\n"
msgstr[1] "增加了 %d 个路径\n"
#: git-add--interactive.perl:626
#, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "更新了 %d 个路径\n"
msgstr[1] "更新了 %d 个路径\n"
#: git-add--interactive.perl:629
#, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "还原了 %d 个路径\n"
msgstr[1] "还原了 %d 个路径\n"
#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "触碰了 %d 个路径\n"
msgstr[1] "触碰了 %d 个路径\n"
#: git-add--interactive.perl:641
msgid "Update"
msgstr "更新"
#: git-add--interactive.perl:653
msgid "Revert"
msgstr "还原"
#: git-add--interactive.perl:676
#, perl-format
msgid "note: %s is untracked now.\n"
msgstr "说明:%s 现已成为未跟踪的。\n"
#: git-add--interactive.perl:687
msgid "Add untracked"
msgstr "添加未跟踪的"
#: git-add--interactive.perl:693
msgid "No untracked files.\n"
msgstr "没有未跟踪的文件。\n"
#: git-add--interactive.perl:1051
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr "如果补丁能干净地应用,编辑块将立即标记为暂存。"
#: git-add--interactive.perl:1054
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr "如果补丁能干净地应用,编辑块将立即标记为贮藏。"
#: git-add--interactive.perl:1057
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr "如果补丁能干净地应用,编辑块将立即标记为未暂存。"
#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
#: git-add--interactive.perl:1075
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr "如果补丁能干净地应用,编辑块将立即标记为应用。"
#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
#: git-add--interactive.perl:1072
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr "如果补丁能干净地应用,编辑块将立即标记为丢弃。"
#: git-add--interactive.perl:1109
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "为写入打开块编辑文件失败:%s"
#: git-add--interactive.perl:1110
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
#: git-add--interactive.perl:1116
#, perl-format
msgid ""
"---\n"
"To remove '%s' lines, make them ' ' lines (context).\n"
"To remove '%s' lines, delete them.\n"
"Lines starting with %s will be removed.\n"
msgstr ""
"---\n"
"要删除 '%s' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
"要删除 '%s' 开始的行,删除它们。\n"
"以 %s 开始的行将被删除。\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
#: git-add--interactive.perl:1124
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"
msgstr ""
"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
"此次编辑被终止,该块不会被修改。\n"
#: git-add--interactive.perl:1138
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "无法读取块编辑文件:%s"
#. TRANSLATORS: do not translate [y/n]
#. The program will only accept that input
#. at this point.
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
#: git-add--interactive.perl:1237
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
#: git-add--interactive.perl:1246
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"q - quit; do not stage this hunk or any of the remaining ones\n"
"a - stage this hunk and all later hunks in the file\n"
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
"y - 暂存该块\n"
"n - 不要暂存该块\n"
"q - 退出。不暂存该块及后面的全部块\n"
"a - 暂存该块和本文件中后面的全部块\n"
"d - 不暂存该块和本文件中后面的全部块"
#: git-add--interactive.perl:1252
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"q - quit; do not stash this hunk or any of the remaining ones\n"
"a - stash this hunk and all later hunks in the file\n"
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
"y - 贮藏该块\n"
"n - 不要贮藏该块\n"
"q - 退出。不贮藏该块及后面的全部块\n"
"a - 贮藏该块和本文件中后面的全部块\n"
"d - 不贮藏该块和本文件中后面的全部块"
#: git-add--interactive.perl:1258
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"q - quit; do not unstage this hunk or any of the remaining ones\n"
"a - unstage this hunk and all later hunks in the file\n"
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
"y - 不暂存该块\n"
"n - 不要不暂存该块\n"
"q - 退出。不要不暂存该块及后面的全部块\n"
"a - 不暂存该块和本文件中后面的全部块\n"
"d - 不要不暂存该块和本文件中后面的全部块"
#: git-add--interactive.perl:1264
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"q - quit; do not apply this hunk or any of the remaining ones\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
"y - 在索引中应用该块\n"
"n - 不要在索引中应用该块\n"
"q - 退出。不要应用该块及后面的全部块\n"
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"q - quit; do not discard this hunk or any of the remaining ones\n"
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
"y - 在工作区中丢弃该块\n"
"n - 不要在工作区中丢弃该块\n"
"q - 退出。不要丢弃该块及后面的全部块\n"
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
#: git-add--interactive.perl:1276
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"q - quit; do not discard this hunk or any of the remaining ones\n"
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
"y - 在索引和工作区中丢弃该块\n"
"n - 不要在索引和工作区中丢弃该块\n"
"q - 退出。不要丢弃该块及后面的全部块\n"
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
#: git-add--interactive.perl:1282
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"q - quit; do not apply this hunk or any of the remaining ones\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
"y - 在索引和工作区中应用该块\n"
"n - 不要在索引和工作区中应用该块\n"
"q - 退出。不要应用该块及后面的全部块\n"
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
#: git-add--interactive.perl:1294
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"q - quit; do not apply this hunk or any of the remaining ones\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
"y - 在工作区中应用该块\n"
"n - 不要在工作区中应用该块\n"
"q - 退出。不要应用该块及后面的全部块\n"
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
#: git-add--interactive.perl:1309
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
"k - leave this hunk undecided, see previous undecided hunk\n"
"K - leave this hunk undecided, see previous hunk\n"
"s - split the current hunk into smaller hunks\n"
"e - manually edit the current hunk\n"
"? - print help\n"
msgstr ""
"g - 选择跳转到一个块\n"
"/ - 查找和给定正则表达式匹配的块\n"
"j - 维持该块未决状态,查看下一个未决块\n"
"J - 维持该块未决状态,查看下一个块\n"
"k - 维持该块未决状态,查看上一个未决块\n"
"K - 维持该块未决状态,查看上一个块\n"
"s - 拆分当前块为更小的块\n"
"e - 手动编辑当前块\n"
"? - 显示帮助\n"
#: git-add--interactive.perl:1340
msgid "The selected hunks do not apply to the index!\n"
msgstr "选中的块不能应用到索引!\n"
#: git-add--interactive.perl:1341
msgid "Apply them to the worktree anyway? "
msgstr "无论如何都要应用到工作区么?"
#: git-add--interactive.perl:1344
msgid "Nothing was applied.\n"
msgstr "未应用。\n"
#: git-add--interactive.perl:1355
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "忽略未合入的:%s\n"
#: git-add--interactive.perl:1364
msgid "Only binary files changed.\n"
msgstr "只有二进制文件被修改。\n"
#: git-add--interactive.perl:1366
msgid "No changes.\n"
msgstr "没有修改。\n"
#: git-add--interactive.perl:1374
msgid "Patch update"
msgstr "补丁更新"
#: git-add--interactive.perl:1426
#, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1427
#, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1428
#, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "暂存该块 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1431
#, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1432
#, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1433
#, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1436
#, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1437
#, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1438
#, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1441
#, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1442
#, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1443
#, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
#, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
#, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1451
#, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1452
#, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1453
#, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1456
#, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1457
#, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1458
#, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1466
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1467
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1468
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
#: git-add--interactive.perl:1568
msgid "No other hunks to goto\n"
msgstr "没有其它可供跳转的块\n"
#: git-add--interactive.perl:1575
msgid "go to which hunk (<ret> to see more)? "
msgstr "跳转到哪个块(<回车> 查看更多)? "
#: git-add--interactive.perl:1577
msgid "go to which hunk? "
msgstr "跳转到哪个块?"
#: git-add--interactive.perl:1586
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "无效数字:'%s'\n"
#: git-add--interactive.perl:1591
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "对不起,只有 %d 个可用块。\n"
msgstr[1] "对不起,只有 %d 个可用块。\n"
#: git-add--interactive.perl:1617
msgid "No other hunks to search\n"
msgstr "没有其它可供查找的块\n"
#: git-add--interactive.perl:1621
msgid "search for regex? "
msgstr "使用正则表达式搜索?"
#: git-add--interactive.perl:1634
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "错误的正则表达式 %s%s\n"
#: git-add--interactive.perl:1644
msgid "No hunk matches the given pattern\n"
msgstr "没有和给定模式相匹配的快\n"
#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
msgid "No previous hunk\n"
msgstr "没有前一个块\n"
#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
msgid "No next hunk\n"
msgstr "没有下一个块\n"
#: git-add--interactive.perl:1690
msgid "Sorry, cannot split this hunk\n"
msgstr "对不起,不能拆分这个块\n"
#: git-add--interactive.perl:1696
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "拆分为 %d 块。\n"
msgstr[1] "拆分为 %d 块。\n"
#: git-add--interactive.perl:1706
msgid "Sorry, cannot edit this hunk\n"
msgstr "对不起,不能编辑这个块\n"
#: git-add--interactive.perl:1752
msgid "Review diff"
msgstr "检视 diff"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
#: git-add--interactive.perl:1771
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"revert - revert staged set of changes back to the HEAD version\n"
"patch - pick hunks and update selectively\n"
"diff - view diff between HEAD and index\n"
"add untracked - add contents of untracked files to the staged set of "
"changes\n"
msgstr ""
"status - 显示含变更的路径\n"
"update - 添加工作区状态至暂存列表\n"
"revert - 还原修改的暂存集至 HEAD 版本\n"
"patch - 挑选块并且有选择地更新\n"
"diff - 显示 HEAD 和索引间差异\n"
"add untracked - 添加未跟踪文件的内容至暂存列表\n"
#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
msgid "missing --"
msgstr "缺失 --"
#: git-add--interactive.perl:1819
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "未知的 --patch 模式:%s"
#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "无效的参数 %s期望是 --"
#: git-send-email.perl:138
msgid "local zone differs from GMT by a non-minute interval\n"
msgstr "本地时间和 GMT 有不到一分钟间隔\n"
#: git-send-email.perl:145 git-send-email.perl:151
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "本地时间偏移量大于等于 24 小时\n"
#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "编辑器非正常退出,终止所有操作"
#: git-send-email.perl:310
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
#: git-send-email.perl:315
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' 包含编辑的邮件。\n"
#: git-send-email.perl:408
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases 和其它选项不兼容\n"
#: git-send-email.perl:481 git-send-email.perl:683
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "不能在仓库之外运行 git format-patch\n"
#: git-send-email.perl:484
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n"
#: git-send-email.perl:497
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "未知的 --suppress-cc 字段:'%s'\n"
#: git-send-email.perl:528
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "未知的 --confirm 设置:'%s'\n"
#: git-send-email.perl:556
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "警告:不支持带引号的 sendmail 别名:%s\n"
#: git-send-email.perl:558
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "警告:不支持 `:include:`%s\n"
#: git-send-email.perl:560
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n"
#: git-send-email.perl:565
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "警告:不能识别的 sendmail 行:%s\n"
#: git-send-email.perl:649
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
"to produce patches for. Please disambiguate by...\n"
"\n"
" * Saying \"./%s\" if you mean a file; or\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
"存在文件 '%s' 但是它也可能是一个用于产生补丁列表的提交范围。请用如下方法消除"
"歧义:\n"
"\n"
" * 如果含义为一个文件,使用 \"./%s\",或者\n"
" * 如果含义为一个范围,使用 --format-patch 选项。\n"
#: git-send-email.perl:670
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "无法打开目录 %s: %s"
#: git-send-email.perl:694
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
"致命错误:%s%s\n"
"警告:补丁未能发送\n"
#: git-send-email.perl:705
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
"\n"
"未指定补丁文件!\n"
"\n"
#: git-send-email.perl:718
#, perl-format
msgid "No subject line in %s?"
msgstr "在 %s 中没有标题行?"
#: git-send-email.perl:728
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "为写入打开 %s 失败: %s"
#: git-send-email.perl:739
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
"for the patch you are writing.\n"
"\n"
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
"以 \"GIT:\" 开头的行将被删除。\n"
"考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n"
"\n"
"如果您不想发送摘要,清除内容。\n"
#: git-send-email.perl:763
#, perl-format
msgid "Failed to open %s: %s"
msgstr "无法打开 %s: %s"
#: git-send-email.perl:780
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "无法打开 %s.final: %s"
#: git-send-email.perl:823
msgid "Summary email is empty, skipping it\n"
msgstr "摘要邮件为空,跳过\n"
#. TRANSLATORS: please keep [y/N] as is.
#: git-send-email.perl:858
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "您确认要使用 <%s> [y/N]"
#: git-send-email.perl:913
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n"
#: git-send-email.perl:918
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]"
#: git-send-email.perl:926
#, perl-format
msgid ""
"Refusing to send because the patch\n"
"\t%s\n"
"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
"want to send.\n"
msgstr ""
"拒绝发送,因为补丁\n"
"\t%s\n"
"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n"
#: git-send-email.perl:945
msgid "To whom should the emails be sent (if anyone)?"
msgstr "邮件将要发送给谁?"
#: git-send-email.perl:963
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "致命错误:别名 '%s' 扩展为它自己\n"
#: git-send-email.perl:975
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr "Message-ID 被用作第一封邮件的 In-Reply-To "
#: git-send-email.perl:1033 git-send-email.perl:1041
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n"
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
#. translation. The program will only accept English input
#. at this point.
#: git-send-email.perl:1045
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit)"
#: git-send-email.perl:1362
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA 路径 \"%s\" 不存在"
#: git-send-email.perl:1445
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
" send-email prompts before sending whenever this occurs.\n"
" This behavior is controlled by the sendemail.confirm\n"
" configuration setting.\n"
"\n"
" For additional information, run 'git send-email --help'.\n"
" To retain the current behavior, but squelch this message,\n"
" run 'git config --global sendemail.confirm auto'.\n"
"\n"
msgstr ""
" 以上的抄送列表Cc已经用补丁提交信息中发现的地址进行\n"
" 了扩展。缺省 send-email 会给出提示。这个行为可以通过\n"
" sendemail.confirm 配置设置。\n"
"\n"
" 更多信息,执行 'git send-email --help'。\n"
" 要保持当前行为,但不显示此信息,运行 'git config --global\n"
" sendemail.confirm auto'。\n"
"\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
#: git-send-email.perl:1460
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
#: git-send-email.perl:1463
msgid "Send this email reply required"
msgstr "发送要求的邮件回复"
#: git-send-email.perl:1491
msgid "The required SMTP server is not properly defined."
msgstr "要求的 SMTP 服务器未被正确定义。"
#: git-send-email.perl:1538
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "服务器不支持 STARTTLS%s"
#: git-send-email.perl:1543 git-send-email.perl:1547
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS 失败!%s"
#: git-send-email.perl:1556
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
#: git-send-email.perl:1574
#, perl-format
msgid "Failed to send %s\n"
msgstr "无法发送 %s\n"
#: git-send-email.perl:1577
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "演习发送 %s\n"
#: git-send-email.perl:1577
#, perl-format
msgid "Sent %s\n"
msgstr "正发送 %s\n"
#: git-send-email.perl:1579
msgid "Dry-OK. Log says:\n"
msgstr "演习成功。日志说:\n"
#: git-send-email.perl:1579
msgid "OK. Log says:\n"
msgstr "OK。日志说\n"
#: git-send-email.perl:1591
msgid "Result: "
msgstr "结果:"
#: git-send-email.perl:1594
msgid "Result: OK\n"
msgstr "结果OK\n"
#: git-send-email.perl:1612
#, perl-format
msgid "can't open file %s"
msgstr "无法打开文件 %s"
#: git-send-email.perl:1659 git-send-email.perl:1679
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) 添加 cc%s 自行 '%s'\n"
#: git-send-email.perl:1665
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) 添加 to%s 自行 '%s'\n"
#: git-send-email.perl:1718
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) 添加 cc%s 自行 '%s'\n"
#: git-send-email.perl:1753
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) 添加 cc: %s 自行 '%s'\n"
#: git-send-email.perl:1864
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) 不能执行 '%s'"
#: git-send-email.perl:1871
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) 添加 %s: %s 自:'%s'\n"
#: git-send-email.perl:1875
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) 无法关闭管道至 '%s'"
#: git-send-email.perl:1905
msgid "cannot send message as 7bit"
msgstr "不能以 7bit 形式发送信息"
#: git-send-email.perl:1913
msgid "invalid transfer encoding"
msgstr "无效的传送编码"
#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "不能打开 %s%s\n"
#: git-send-email.perl:1957
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s补丁包含一个超过 998 字符的行"
#: git-send-email.perl:1974
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr "略过 %s 含备份后缀 '%s'。\n"
#. TRANSLATORS: please keep "[y|N]" as is.
#: git-send-email.perl:1978
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "您真的要发送 %s[y|N]"