Translated using Weblate (Chinese (Simplified))

Currently translated at 36.9% (4079 of 11052 strings) Translation: Git Manpages/Translations Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/zh_Hans/ Signed-off-by: 秃头灯笼鱼 <ttdlyu@163.com>

Translated using Weblate (Chinese (Simplified))
4612a0b5 · 秃头灯笼鱼 · Hosted Weblate · cf0f27fd · 4612a0b5
Unverified Commit 4612a0b5 authored 1 year ago by 秃头灯笼鱼 Committed by Hosted Weblate 1 year ago
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.po
@@ -3,19 +3,7 @@
 # This file is distributed under the same license as the Git package.
 # Matthias Aßhauer <mha1993@live.de>, 2019.
 msgid ""
-msgstr ""
+msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2023-02-26 14:06+0100\nPO-Revision-Date: 2023-05-21 07:22+0000\nLast-Translator: 秃头灯笼鱼 <ttdlyu@163.com>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: zh_HANS-CN\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=1; plural=0;\nX-Generator: Weblate 4.18-dev\n"
-"Project-Id-Version: git documentation\n"
-"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2023-02-26 14:06+0100\n"
-"PO-Revision-Date: 2023-05-18 17:58+0000\n"
-"Last-Translator: 秃头灯笼鱼 <ttdlyu@163.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: zh_HANS-CN\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.18-dev\n"
 #. type: Labeled list
 #: en/blame-options.txt:1 en/diff-options.txt:769 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:146 en/git-status.txt:31
@@ -1616,8 +1604,8 @@ msgstr ""
 msgid "linkgit:git-name-rev[1]"
 msgstr "linkgit:git-name-rev[1]"
-#. type: Plain text
 # 查找给定版本的符号名称
+#. type: Plain text
 #: en/cmds-plumbinginterrogators.txt:39
 #, priority:100
 msgid "Find symbolic names for given revs."
@@ -5796,7 +5784,7 @@ msgstr "--default-prefix"
 #: en/diff-options.txt:859
 #, priority:280
 msgid "Use the default source and destination prefixes (\"a/\" and \"b/\").  This is usually the default already, but may be used to override config such as `diff.noprefix`."
-msgstr ""
+msgstr "使用默认的源和目标前缀（\"a/\"和 \"b/\"）。  这通常已经是默认的，但可以用来覆盖配置，如 `diff.noprefix`。"
 #. type: Labeled list
 #: en/diff-options.txt:860
@@ -5982,7 +5970,7 @@ msgstr "--negotiate-only"
 #: en/fetch-options.txt:73
 #, priority:220
 msgid "Do not fetch anything from the server, and instead print the ancestors of the provided `--negotiation-tip=*` arguments, which we have in common with the server."
-msgstr ""
+msgstr "不从服务器获取任何东西，而是打印所提供的 `--negotiation-tip=*` 参数与服务器上的共同祖先。"
 #. type: Plain text
 #: en/fetch-options.txt:77
@@ -6006,13 +5994,13 @@ msgstr "显示会做什么，而不做任何改变。"
 #: en/fetch-options.txt:84
 #, priority:220
 msgid "Print the output to standard output in an easy-to-parse format for scripts. See section OUTPUT in linkgit:git-fetch[1] for details."
-msgstr ""
+msgstr "将输出结果以易于解析的格式打印到标准输出，供脚本使用。详情见 linkgit:git-fetch[1] 中的输出部分。"
 #. type: Plain text
 #: en/fetch-options.txt:87
 #, priority:220
 msgid "This is incompatible with `--recurse-submodules=[yes|on-demand]` and takes precedence over the `fetch.output` config option."
-msgstr ""
+msgstr "这与 `--recurse-submodules=[yes|on-demand]` 选项不兼容，并且优先于 `fetch.output` 配置选项。"
 #. type: Labeled list
 #: en/fetch-options.txt:89
@@ -6042,7 +6030,7 @@ msgstr "--force"
 #: en/fetch-options.txt:101
 #, priority:220
 msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
-msgstr ""
+msgstr "正如讨论的那样，当 'git fetch' 与 `<src>:<dst>` 引用规范一起使用时，它可能会拒绝更新本地分支"
 #. type: Plain text
 #: en/fetch-options.txt:104
@@ -6050,19 +6038,19 @@ msgstr ""
 msgid ""
 "\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
 "\tdocumentation.\n"
-msgstr ""
+msgstr "\t在linkgit:git-fetch[1]的`<引用规范>`部分。\n\t文档中。\n"
 #. type: Plain text
 #: en/fetch-options.txt:107
 #, no-wrap, priority:220
 msgid "\tin the `<refspec>` part below.\n"
-msgstr ""
+msgstr "\t在下面的 `<引用规范>` 部分。\n"
 #. type: Plain text
 #: en/fetch-options.txt:109
 #, no-wrap, priority:220
 msgid "\tThis option overrides that check.\n"
-msgstr ""
+msgstr "\t这个选项覆盖了这个检查。\n"
 #. type: Labeled list
 #: en/fetch-options.txt:110 en/git-am.txt:44 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:133 en/git-ls-files.txt:86 en/git-mailinfo.txt:29 en/git-mv.txt:34 en/git-repack.txt:177 en/git-stash.txt:189
@@ -6080,7 +6068,7 @@ msgstr "--keep"
 #: en/fetch-options.txt:113
 #, priority:220
 msgid "Keep downloaded pack."
-msgstr ""
+msgstr "保存下载的包。"
 #. type: Labeled list
 #: en/fetch-options.txt:115
@@ -6092,7 +6080,7 @@ msgstr "--multiple"
 #: en/fetch-options.txt:118
 #, priority:220
 msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
-msgstr ""
+msgstr "允许指定几个 <仓库> 和 <group> 参数。不可以指定 <引用规范>。"
 #. type: Labeled list
 #: en/fetch-options.txt:119
@@ -6110,7 +6098,7 @@ msgstr "--[no-]auto-gc"
 #: en/fetch-options.txt:124
 #, priority:220
 msgid "Run `git maintenance run --auto` at the end to perform automatic repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)  This is enabled by default."
-msgstr ""
+msgstr "在最后运行 `git maintenance run --auto`，以在需要时执行自动仓库维护。（与 \"--[no-]auto-gc\" 选项效果一样。）这个功能默认启用。"
 #. type: Labeled list
 #: en/fetch-options.txt:125
@@ -6122,7 +6110,7 @@ msgstr "--[no-]write-commit-graph"
 #: en/fetch-options.txt:128
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
-msgstr ""
+msgstr "在获取后写一个提交图。这会覆盖 `fetch.writeCommitGraph` 配置选项。"
 #. type: Labeled list
 #: en/fetch-options.txt:130
@@ -6132,9 +6120,9 @@ msgstr "--prefetch"
 #. type: Plain text
 #: en/fetch-options.txt:134
-#, priority:220
+#, fuzzy, priority:220
 msgid "Modify the configured refspec to place all refs into the `refs/prefetch/` namespace. See the `prefetch` task in linkgit:git-maintenance[1]."
-msgstr ""
+msgstr "修改配置的引用规范，将所有引用放到 `refs/prefetch/` 命名空间中。参见 linkgit:git-maintenance[1] 中的 `prefetch` 任务。"
 #. type: Labeled list
 #: en/fetch-options.txt:136 en/git-push.txt:154
@@ -6146,13 +6134,13 @@ msgstr "--prune"
 #: en/fetch-options.txt:146
 #, priority:220
 msgid "Before fetching, remove any remote-tracking references that no longer exist on the remote.  Tags are not subject to pruning if they are fetched only because of the default tag auto-following or due to a --tags option.  However, if tags are fetched due to an explicit refspec (either on the command line or in the remote configuration, for example if the remote was cloned with the --mirror option), then they are also subject to pruning. Supplying `--prune-tags` is a shorthand for providing the tag refspec."
-msgstr ""
+msgstr "在获取之前，删除任何不再存在于远程的远程跟踪引用。  如果只是因为默认的标签自动跟踪或者因为 --tags 选项而获取标签，则不需要剪枝。  然而，如果标签是由于明确的引用规范（无论是在命令行还是在远程配置中，例如，如果远程是用 --mirror 选项克隆的）而被获取的，那么它们也会被剪除。提供 `--prune-tags` 是提供标签引用规范的速记方法。"
 #. type: Plain text
 #: en/fetch-options.txt:149 en/fetch-options.txt:160
 #, priority:220
 msgid "See the PRUNING section below for more details."
-msgstr ""
+msgstr "更多细节见下面的 剪枝 部分。"
 #. type: Labeled list
 #: en/fetch-options.txt:150 en/git-cvsexportcommit.txt:57 en/git-grep.txt:135 en/git.txt:135 en/rev-list-options.txt:97
@@ -6170,7 +6158,7 @@ msgstr "--prune-tags"
 #: en/fetch-options.txt:158
 #, priority:220
 msgid "Before fetching, remove any local tags that no longer exist on the remote if `--prune` is enabled. This option should be used more carefully, unlike `--prune` it will remove any local references (local tags) that have been created. This option is a shorthand for providing the explicit tag refspec along with `--prune`, see the discussion about that in its documentation."
-msgstr ""
+msgstr "在获取之前，如果 `--prune` 被启用，则删除任何不再存在于远程的本地标签。这个选项应该更谨慎使用，与`--prune`不同，它将删除任何已经创建的本地引用（本地标签）。这个选项是与`--prune`一起提供明确的标签引用规范的速记形式，见其文档中关于这个的讨论。"
 #. type: Labeled list
 #: en/fetch-options.txt:164 en/git-add.txt:69 en/git-am.txt:143 en/git-blame.txt:71 en/git-checkout-index.txt:45 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:153 en/git-commit.txt:214 en/git-format-patch.txt:118 en/git-grep.txt:148 en/git-mailinfo.txt:68 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:173 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:419 en/git-reflog.txt:116 en/git-repack.txt:100 en/git-revert.txt:77 en/git-rm.txt:52 en/git-shortlog.txt:29 en/git-submodule.txt:316 en/git-svn.txt:686 en/git-unpack-objects.txt:30 en/git-worktree.txt:220 en/merge-options.txt:108
@@ -6188,7 +6176,7 @@ msgstr "--no-tags"
 #: en/fetch-options.txt:172
 #, priority:220
 msgid "By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally.  This option disables this automatic tag following. The default behavior for a remote may be specified with the remote.<name>.tagOpt setting. See linkgit:git-config[1]."
-msgstr ""
+msgstr "默认情况下，指向从远程仓库下载的对象的标签会被获取并存储到本地。  这个选项禁用了这种自动标记跟踪。远程的默认行为可以通过 remote.<远程名称>.tagOpt 设置来指定。参见 linkgit:git-config[1]。"
 #. type: Labeled list
 #: en/fetch-options.txt:174 en/git-fetch-pack.txt:104
@@ -6200,7 +6188,7 @@ msgstr "--refetch"
 #: en/fetch-options.txt:181
 #, priority:220
 msgid "Instead of negotiating with the server to avoid transferring commits and associated objects that are already present locally, this option fetches all objects as a fresh clone would. Use this to reapply a partial clone filter from configuration or using `--filter=` when the filter definition has changed. Automatic post-fetch maintenance will perform object database pack consolidation to remove any duplicate objects."
-msgstr ""
+msgstr "这个选项不是与服务器协商以避免传输本地已经存在的提交和相关对象，而是像一个新的克隆那样获取所有对象。当过滤器定义发生变化时，使用此选项重新应用配置中的部分克隆过滤器或使用 `--filter=`。自动获取后的维护将执行对象数据库包的整合，以删除任何重复的对象。"
 #. type: Labeled list
 #: en/fetch-options.txt:183
@@ -6212,7 +6200,7 @@ msgstr "--refmap=<refspec>"
 #: en/fetch-options.txt:193
 #, priority:220
 msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
-msgstr ""
+msgstr "当获取命令行上列出的引用时，使用指定的引用规范（可以是多个）来映射引用到远程跟踪分支，而不是远程仓库的 `remote.*.fetch` 配置变量的值。  为 `--refmap` 选项提供一个空的 `<引用规范>` 会导致Git忽略配置的引用规范，而完全依赖作为命令行参数提供的引用规范。详见 \"配置的远程跟踪分支\" 一节。"
 #. type: Labeled list
 #: en/fetch-options.txt:195 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:187 en/git-show-ref.txt:41
@@ -6224,7 +6212,7 @@ msgstr "--tags"
 #: en/fetch-options.txt:202
 #, priority:220
 msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched.  Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
-msgstr ""
+msgstr "从远程获取所有标签（即，将远程标签 `refs/tags/*` 获取为同名的本地标签），除此之外，还可以获取其他东西。  单独使用这个选项，即使使用了 --prune，也不会对标签进行修剪（尽管标签是一个明确了无论如何也要删除的引用规范目标，见 `--prune` 选项）。"
 #. type: Labeled list
 #: en/fetch-options.txt:204
@@ -6236,19 +6224,19 @@ msgstr "--recurse-submodules[=yes|on-demand|no]"
 #: en/fetch-options.txt:214
 #, priority:220
 msgid "This option controls if and under what conditions new commits of submodules should be fetched too. When recursing through submodules, `git fetch` always attempts to fetch \"changed\" submodules, that is, a submodule that has commits that are referenced by a newly fetched superproject commit but are missing in the local submodule clone. A changed submodule can be fetched as long as it is present locally e.g.  in `$GIT_DIR/modules/` (see linkgit:gitsubmodules[7]); if the upstream adds a new submodule, that submodule cannot be fetched until it is cloned e.g. by `git submodule update`."
-msgstr ""
+msgstr "这个选项控制是否以及在什么条件下，子模块的新提交也应该被获取。当遍历子模块时，`git fetch` 总是试图获取 \"改变的\" 子模块，也就是说，一个子模块的提交被新获取的父项目提交所引用，但在本地的子模块克隆中却没有。一个改变了的子模块可以被获取，只要它在本地存在，例如在`$GIT_DIR/modules/`（见linkgit:gitsubmodules[7]）；如果上游添加了一个新的子模块，该子模块不能被获取，直到它被克隆，例如通过`git submodule update`。"
 #. type: Plain text
 #: en/fetch-options.txt:219
 #, priority:220
 msgid "When set to 'on-demand', only changed submodules are fetched. When set to 'yes', all populated submodules are fetched and submodules that are both unpopulated and changed are fetched. When set to 'no', submodules are never fetched."
-msgstr ""
+msgstr "当设置为 'on-demand' 时，只取回已改变的子模块。当设置为 'yes' 时，所有已填充的子模块都被获取，同时未填充和已改变的子模块也被获取。当设置为 'no' 时，子模块永远不会被获取。"
 #. type: Plain text
 #: en/fetch-options.txt:223
 #, priority:220
 msgid "When unspecified, this uses the value of `fetch.recurseSubmodules` if it is set (see linkgit:git-config[1]), defaulting to 'on-demand' if unset.  When this option is used without any value, it defaults to 'yes'."
-msgstr ""
+msgstr "当未指定时，如果设置了 `fetch.recurseSubmodules`，则使用该值（见linkgit:git-config[1]），如果未设置则默认为 'on-demand'。  当这个选项被使用而没有任何值时，它默认为 'yes'。"
 #. type: Labeled list
 #: en/fetch-options.txt:225
@@ -6266,19 +6254,19 @@ msgstr "--jobs=<n>"
 #: en/fetch-options.txt:228
 #, priority:220
 msgid "Number of parallel children to be used for all forms of fetching."
-msgstr ""
+msgstr "用于所有形式的获取的并行子进程的数量。"
 #. type: Plain text
 #: en/fetch-options.txt:233
 #, priority:220
 msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
-msgstr ""
+msgstr "如果指定了 `--multiple` 选项，不同的远程将被并行获取。如果多个子模块被取走，它们将并行获取。要独立控制它们，使用配置 `fetch.parallel` 和 `submodule.fetchJobs`（见linkgit:git-config[1]）。"
 #. type: Plain text
 #: en/fetch-options.txt:236
 #, priority:220
 msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
-msgstr ""
+msgstr "通常情况下，并行的递归和多远程的提取会更快。默认情况下，检索是按顺序进行的，而不是并行的。"
 #. type: Labeled list
 #: en/fetch-options.txt:238 en/git-checkout.txt:300 en/git-push.txt:402 en/git-restore.txt:111 en/git-switch.txt:184
@@ -6290,7 +6278,7 @@ msgstr "--no-recurse-submodules"
 #: en/fetch-options.txt:241
 #, priority:220
 msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
-msgstr ""
+msgstr "禁用子模块的递归获取（这与使用 `--recurse-submodules=no` 选项的效果相同）。"
 #. type: Labeled list
 #: en/fetch-options.txt:243 en/git-branch.txt:267 en/git-push.txt:374
@@ -6302,7 +6290,7 @@ msgstr "--set-upstream"
 #: en/fetch-options.txt:249
 #, priority:220
 msgid "If the remote is fetched successfully, add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
-msgstr ""
+msgstr "如果远程被成功获取，添加上游（跟踪）引用，由无参数的 linkgit:git-pull[1] 和其他命令使用。更多信息，见 linkgit:git-config[1] 中的 `branch.<名称>.merge` 和 `branch.<名称>.remote`。"
 #. type: Labeled list
 #: en/fetch-options.txt:251
@@ -6314,7 +6302,7 @@ msgstr "--submodule-prefix=<path>"
 #: en/fetch-options.txt:255
 #, priority:220
 msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\".  This option is used internally when recursing over submodules."
-msgstr ""
+msgstr "将 <路径> 添加到信息性消息中打印的路径，例如“获取子模块 foo”。递归子模块时在内部使用此选项。"
 #. type: Labeled list
 #: en/fetch-options.txt:256
@@ -6326,7 +6314,7 @@ msgstr "--recurse-submodules-default=[yes|on-demand]"
 #: en/fetch-options.txt:263
 #, priority:220
 msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option.  All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
-msgstr ""
+msgstr "这个选项在内部被用来为 --recurse-submodules 选项暂时提供一个非负的默认值。  所有其他配置获取子模块递归的方法（比如 linkgit:gitmodules[5] 和 linkgit:git-config[1] 中的设置）都覆盖这个选项，直接指定 --[no-]recurse-submodules 也是如此。"
 #. type: Labeled list
 #: en/fetch-options.txt:265
@@ -6338,7 +6326,7 @@ msgstr "--update-head-ok"
 #: en/fetch-options.txt:272
 #, priority:220
 msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch.  This flag disables the check.  This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
-msgstr ""
+msgstr "默认情况下，\"git fetch\" 拒绝更新与当前分支相对应的头部。  这个标志禁用了这种检查。  这纯粹是为了让 'git pull' 与 'git fetch' 沟通的内部使用，除非你正在实现你自己的上层命令，否则你不应该使用它。"
 #. type: Labeled list
 #: en/fetch-options.txt:274 en/git-clone.txt:219
@@ -6350,7 +6338,7 @@ msgstr "--upload-pack <upload-pack>"
 #: en/fetch-options.txt:279
 #, priority:220
 msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
-msgstr ""
+msgstr "当给出时，并且要获取的仓库是由 'git fetch-pack' 处理的，`--exec=<upload-pack>` 被传递到命令中，为另一端运行的命令指定非默认路径。"
 #. type: Labeled list
 #: en/fetch-options.txt:281 en/git-am.txt:88 en/git-apply.txt:231 en/git-branch.txt:202 en/git-bundle.txt:126 en/git-checkout-index.txt:31 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:129 en/git-commit.txt:369 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:374 en/git-grep.txt:294 en/git-imap-send.txt:36 en/git-init.txt:43 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:213 en/git-prune-packed.txt:36 en/git-pull.txt:80 en/git-push.txt:386 en/git-read-tree.txt:117 en/git-rebase.txt:407 en/git-repack.txt:95 en/git-reset.txt:107 en/git-restore.txt:66 en/git-rev-parse.txt:117 en/git-rm.txt:81 en/git-show-ref.txt:70 en/git-stash.txt:238 en/git-submodule.txt:269 en/git-svn.txt:670 en/git-switch.txt:142 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:58 en/git-worktree.txt:237 en/merge-options.txt:174
@@ -6362,7 +6350,7 @@ msgstr "-q"
 #: en/fetch-options.txt:286
 #, priority:220
 msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
-msgstr ""
+msgstr "将 --quiet 传递给 git-fetch-pack，并使任何其他内部使用的 git 命令保持沉默。进度不会报告给标准错误流。"
 #. type: Labeled list
 #: en/fetch-options.txt:287 en/git-add.txt:74 en/git-apply.txt:225 en/git-archimport.txt:74 en/git-archive.txt:49 en/git-branch.txt:191 en/git-cherry.txt:29 en/git-clone.txt:134 en/git-commit.txt:354 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:115 en/git-grep.txt:110 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:28 en/git-ls-files.txt:164 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:86 en/git-push.txt:392 en/git-read-tree.txt:63 en/git-rebase.txt:411 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git.txt:41 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:241 en/merge-options.txt:178
@@ -6392,7 +6380,7 @@ msgstr "--progress"
 #: en/fetch-options.txt:297 en/git-bundle.txt:119 en/git-pack-objects.txt:196 en/git-push.txt:401
 #, priority:220
 msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
-msgstr ""
+msgstr "当标准错误流连接到终端时，除非指定了 -q，否则默认情况下会在标准错误流上报告进展状态。即使标准错误流没有指向终端，这个标志也会强制显示进度状态。"
 #. type: Labeled list
 #: en/fetch-options.txt:298 en/git-ls-remote.txt:75 en/git-push.txt:216
@@ -6422,7 +6410,7 @@ msgstr "--show-forced-updates"
 #: en/fetch-options.txt:312
 #, priority:220
 msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs.  See linkgit:git-config[1]."
-msgstr ""
+msgstr "默认情况下，git 在获取过程中会检查一个分支是否被强制更新了。这可以通过 fetch.showForcedUpdates 禁用，但 --show-forced-updates 选项保证了这种检查的发生。  参见 linkgit:git-config[1]。"
 #. type: Labeled list
 #: en/fetch-options.txt:313
@@ -6434,7 +6422,7 @@ msgstr "--no-show-forced-updates"
 #: en/fetch-options.txt:319
 #, priority:220
 msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
-msgstr ""
+msgstr "默认情况下，git 会在获取过程中检查一个分支是否被强制更新了。通过 --no-show-forced-updates 或将 fetch.showForcedUpdates 设置为 false 来跳过这个检查，以保证性能。如果在 'git-pull' 中使用 --ff-only 选项，在尝试快速更新前仍会检查强制更新。见 linkgit:git-config[1]。"
 #. type: Labeled list
 #: en/fetch-options.txt:320 en/git-push.txt:427
@@ -6470,7 +6458,7 @@ msgstr "--ipv6"
 #: en/fetch-options.txt:326 en/git-push.txt:434
 #, priority:220
 msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
-msgstr ""
+msgstr "仅使用 IPv6 地址，忽略 IPv4 地址。"
 #. type: Title =
 #: en/git-add.txt:2
@@ -7143,8 +7131,8 @@ msgstr "删除的内容"
 msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)."
 msgstr "删除的内容以“-”开头的行表示。您可以通过将“-”转换为“ ”（空格）来防止将其删除。"
-#. type: Labeled list
 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
+#. type: Labeled list
 #: en/git-add.txt:388
 #, no-wrap, priority:300
 msgid "modified content"
@@ -10363,7 +10351,7 @@ msgstr "--omit-empty"
 #: en/git-branch.txt:162 en/git-for-each-ref.txt:104 en/git-tag.txt:137
 #, priority:260
 msgid "Do not print a newline after formatted refs where the format expands to the empty string."
-msgstr ""
+msgstr "在格式化的引用后不打印换行，因为格式化的引用会扩展为空字符串。"
 #. type: Labeled list
 #: en/git-branch.txt:163 en/git-status.txt:130 en/git-tag.txt:138
@@ -12615,7 +12603,7 @@ msgstr ""
 #: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239 en/git-merge-tree.txt:187 en/git-remote.txt:209
 #, no-wrap, priority:220
 msgid "EXIT STATUS"
-msgstr ""
+msgstr "退出状态码"
 #. type: Labeled list
 #: en/git-check-ignore.txt:109
@@ -13790,7 +13778,7 @@ msgstr "当只有一个参数且不是`--`时（例如`git checkout abc`），
 #: en/git-checkout.txt:519
 #, no-wrap, priority:240
 msgid "1. Paths"
-msgstr ""
+msgstr "1.路径"
 #. type: Plain text
 #: en/git-checkout.txt:524
@@ -15096,7 +15084,7 @@ msgstr "如果将存储库指定为本地路径（例如，`/path/to/repo`），
 #: en/git-clone.txt:65
 #, priority:300
 msgid "If the repository's `$GIT_DIR/objects` has symbolic links or is a symbolic link, the clone will fail. This is a security measure to prevent the unintentional copying of files by dereferencing the symbolic links."
-msgstr ""
+msgstr "如果仓库的 `$GIT_DIR/objects` 有符号链接或者它就是符号链接，克隆将会失败。这是一项安全措施，以防止通过解读符号链接意外地复制文件。"
 #. type: Plain text
 #: en/git-clone.txt:69
@@ -24854,7 +24842,7 @@ msgstr ""
 #: en/git-fetch-pack.txt:117 en/git-push.txt:395 en/git-send-pack.txt:64
 #, priority:220
 msgid "Run verbosely."
-msgstr ""
+msgstr "详细运行。"
 #. type: Plain text
 #: en/git-fetch-pack.txt:120
@@ -24900,61 +24888,61 @@ msgid ""
 "'git fetch' [<options>] <group>\n"
 "'git fetch' --multiple [<options>] [(<repository> | <group>)...]\n"
 "'git fetch' --all [<options>]\n"
-msgstr ""
+msgstr "'git fetch' [<选项>] [<仓库> [<引用规范>...]]\n'git fetch' [<选项>] <组>\n'git fetch' --multiple [<选项>] [(<仓库> | <组>)...]\n'git fetch' --all [<选项>]\n"
 #. type: Plain text
 #: en/git-fetch.txt:24
 #, priority:220
 msgid "Fetch branches and/or tags (collectively, \"refs\") from one or more other repositories, along with the objects necessary to complete their histories.  Remote-tracking branches are updated (see the description of <refspec> below for ways to control this behavior)."
-msgstr ""
+msgstr "从一个或多个其它仓库获取分支和/或标记（统称为 \"refs\"），以及完成其历史所需的对象。  远程跟踪的分支会被更新（关于控制这种行为的方法，请参见下面 <引用规范> 的描述）。"
 #. type: Plain text
 #: en/git-fetch.txt:32
 #, priority:220
 msgid "By default, any tag that points into the histories being fetched is also fetched; the effect is to fetch tags that point at branches that you are interested in.  This default behavior can be changed by using the --tags or --no-tags options or by configuring remote.<name>.tagOpt.  By using a refspec that fetches tags explicitly, you can fetch tags that do not point into branches you are interested in as well."
-msgstr ""
+msgstr "默认情况下，任何指向被获取的历史的标签也会被获取；其效果是获取指向你感兴趣的分支的标签。  这个默认行为可以通过使用 --tags 或 --no-tags 选项或者配置 remote.<远程仓库名称>.tagOpt 来改变。  通过使用明确获取标签的引用规范，你也可以获取那些没有指向你感兴趣的分支的标签。"
 #. type: Plain text
 #: en/git-fetch.txt:37
 #, priority:220
 msgid "'git fetch' can fetch from either a single named repository or URL, or from several repositories at once if <group> is given and there is a remotes.<group> entry in the configuration file.  (See linkgit:git-config[1])."
-msgstr ""
+msgstr "'git fetch' 可以从一个命名的仓库或 URL 中获取，或者如果给定了 <组> 并且在配置文件中有 remotes.<组> 项，则可以同时从几个仓库获取。  (参见 linkgit:git-config[1]）。"
 #. type: Plain text
 #: en/git-fetch.txt:40
 #, priority:220
 msgid "When no remote is specified, by default the `origin` remote will be used, unless there's an upstream branch configured for the current branch."
-msgstr ""
+msgstr "当没有指定远程仓库时，默认情况下将使用 `origin` 远程仓库，除非有一个上游分支配置在当前分支上。"
 #. type: Plain text
 #: en/git-fetch.txt:44
 #, priority:220
 msgid "The names of refs that are fetched, together with the object names they point at, are written to `.git/FETCH_HEAD`.  This information may be used by scripts or other git commands, such as linkgit:git-pull[1]."
-msgstr ""
+msgstr "被获取的引用名称，以及它们所指向的对象名称，被写到 `.git/FETCH_HEAD`。  这些信息可以被脚本或其他 git 命令使用，比如linkgit:git-pull[1]。"
 #. type: Plain text
 #: en/git-fetch.txt:54
 #, priority:220
 msgid "Read refspecs, one per line, from stdin in addition to those provided as arguments. The \"tag <name>\" format is not supported."
-msgstr ""
+msgstr "从stdin中读取引用规范，每行一个，除了作为参数提供的那些之外。不支持 \"标签 <名称>\" 格式。"
 #. type: Title -
 #: en/git-fetch.txt:59
 #, no-wrap, priority:220
 msgid "CONFIGURED REMOTE-TRACKING BRANCHES[[CRTB]]"
-msgstr ""
+msgstr "配置的远程跟踪分支 [[CRTB]]"
 #. type: Plain text
 #: en/git-fetch.txt:65
 #, priority:220
 msgid "You often interact with the same remote repository by regularly and repeatedly fetching from it.  In order to keep track of the progress of such a remote repository, `git fetch` allows you to configure `remote.<repository>.fetch` configuration variables."
-msgstr ""
+msgstr "你通过经常定期和重复地从同一个远程仓库取东西来与之互动。  为了跟踪这种远程仓库的进度，`git fetch` 允许你配置 `remote.<仓库>.fetch` 配置变量。"
 #. type: Plain text
 #: en/git-fetch.txt:67
 #, priority:220
 msgid "Typically such a variable may look like this:"
-msgstr ""
+msgstr "一般来说，这种变量可能看起来像这样："
 #. type: delimited block -
 #: en/git-fetch.txt:71
@@ -24970,49 +24958,49 @@ msgstr ""
 #: en/git-fetch.txt:74
 #, priority:220
 msgid "This configuration is used in two ways:"
-msgstr ""
+msgstr "这种配置有两种使用方式："
 #. type: Plain text
 #: en/git-fetch.txt:84
 #, priority:220
 msgid "When `git fetch` is run without specifying what branches and/or tags to fetch on the command line, e.g. `git fetch origin` or `git fetch`, `remote.<repository>.fetch` values are used as the refspecs--they specify which refs to fetch and which local refs to update.  The example above will fetch all branches that exist in the `origin` (i.e. any ref that matches the left-hand side of the value, `refs/heads/*`) and update the corresponding remote-tracking branches in the `refs/remotes/origin/*` hierarchy."
-msgstr ""
+msgstr "当 `git fetch` 运行时，没有在命令行中指定要取哪些分支和/或标记，例如 `git fetch origin` 或 `git fetch`，`remote.<仓库>.fetch` 值被用作引用规范——它们指定要取哪些引用和要更新哪些本地引用。  上面的例子将获取所有存在于 `origin` 中的分支（即任何与数值左边的`refs/heads/*`相匹配的引用），并更新 `refs/remotes/origin/*` 层次结构中相应的远程跟踪的分支。"
 #. type: Plain text
 #: en/git-fetch.txt:101
 #, priority:220
 msgid "When `git fetch` is run with explicit branches and/or tags to fetch on the command line, e.g. `git fetch origin master`, the <refspec>s given on the command line determine what are to be fetched (e.g. `master` in the example, which is a short-hand for `master:`, which in turn means \"fetch the 'master' branch but I do not explicitly say what remote-tracking branch to update with it from the command line\"), and the example command will fetch _only_ the 'master' branch.  The `remote.<repository>.fetch` values determine which remote-tracking branch, if any, is updated.  When used in this way, the `remote.<repository>.fetch` values do not have any effect in deciding _what_ gets fetched (i.e. the values are not used as refspecs when the command-line lists refspecs); they are only used to decide _where_ the refs that are fetched are stored by acting as a mapping."
-msgstr ""
+msgstr "当 `git fetch` 运行时，命令行上有明确的要取的分支和/或标记，例如 `git fetch origin master`，命令行上给出的所有 <引用规范> 决定了要取的是什么（例如例子中的 `master` 是  `master:` 的简称，意思是 \"获取 'master' 分支，但我没有明确说要在命令行中更新哪个远程跟踪分支\"），而这个例子的命令将「只」获取 'master' 分支。  `remote.<仓库>.fetch`值决定了哪个远程跟踪分支（如果有的话）被更新。  当以这种方式使用时，`remote.<仓库>.fetch` 值对决定获取什么没有任何影响（即当命令行列出引用规范时，这些值不会被用作引用规范）；它们只是通过作为一个映射来决定获取的引用被存储在哪里。"
 #. type: Plain text
 #: en/git-fetch.txt:105
 #, priority:220
 msgid "The latter use of the `remote.<repository>.fetch` values can be overridden by giving the `--refmap=<refspec>` parameter(s) on the command line."
-msgstr ""
+msgstr "后者对 `remote.<仓库>.fetch` 值的使用可以通过在命令行中给出 `--refmap=<引用规范>` 参数去覆盖。"
 #. type: Title -
 #: en/git-fetch.txt:107
 #, no-wrap, priority:220
 msgid "PRUNING"
-msgstr ""
+msgstr "剪枝"
 #. type: Plain text
 #: en/git-fetch.txt:112
 #, priority:220
 msgid "Git has a default disposition of keeping data unless it's explicitly thrown away; this extends to holding onto local references to branches on remotes that have themselves deleted those branches."
-msgstr ""
+msgstr "Git默认保留数据，除非它被明确地扔掉；这延伸到保留对远程分支的本地引用，而这些分支本身已经被删除。"
 #. type: Plain text
 #: en/git-fetch.txt:118
 #, priority:220
 msgid "If left to accumulate, these stale references might make performance worse on big and busy repos that have a lot of branch churn, and e.g. make the output of commands like `git branch -a --contains <commit>` needlessly verbose, as well as impacting anything else that'll work with the complete set of known references."
-msgstr ""
+msgstr "如果任其积累，这些陈旧的引用可能会使大型繁忙仓库的性能变差，例如，使 `git branch -a --contains <提交>` 等命令的输出不必要地冗长，以及影响其他任何与完整的已知引用有关的工作。"
 #. type: Plain text
 #: en/git-fetch.txt:121
 #, priority:220
 msgid "These remote-tracking references can be deleted as a one-off with either of:"
-msgstr ""
+msgstr "这些远程跟踪引用可以通过以下两种方式一次性删除："
 #. type: delimited block -
 #: en/git-fetch.txt:125
@@ -25020,7 +25008,7 @@ msgstr ""
 msgid ""
 "# While fetching\n"
 "$ git fetch --prune <name>\n"
-msgstr ""
+msgstr "# 在获取的时候\n$ git fetch --prune <名称>\n"
 #. type: delimited block -
 #: en/git-fetch.txt:128
@@ -25036,43 +25024,43 @@ msgstr ""
 #: en/git-fetch.txt:134
 #, priority:220
 msgid "To prune references as part of your normal workflow without needing to remember to run that, set `fetch.prune` globally, or `remote.<name>.prune` per-remote in the config. See linkgit:git-config[1]."
-msgstr ""
+msgstr "要把修剪引用作为正常工作流程的一部分，而不需要记住运行该程序，可以在全局设置 `fetch.prune`，或者在配置中设置 `remote.<名称>.prune`，为每个远程仓库进行设置。见linkgit:git-config[1]。"
 #. type: Plain text
 #: en/git-fetch.txt:139
 #, priority:220
 msgid "Here's where things get tricky and more specific. The pruning feature doesn't actually care about branches, instead it'll prune local <--> remote-references as a function of the refspec of the remote (see `<refspec>` and <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> above)."
-msgstr ""
+msgstr "这里是事情变得棘手和更具体的地方。修剪功能实际上并不关心分支，相反，它将修剪本地<-->远程引用，作为远程的引用规范的函数（见上面的`<引用规范>`和上面的<<CRTB，配置远程跟踪分支>>）。"
 #. type: Plain text
 #: en/git-fetch.txt:145
 #, priority:220
 msgid "Therefore if the refspec for the remote includes e.g. `refs/tags/*:refs/tags/*`, or you manually run e.g. `git fetch --prune <name> \"refs/tags/*:refs/tags/*\"` it won't be stale remote tracking branches that are deleted, but any local tag that doesn't exist on the remote."
-msgstr ""
+msgstr "因此，如果远程的引用规范包括例如 `refs/tags/*:refs/tags/*`这样的规范，或者你手动运行例如 `git fetch --prune <名称> \"refs/tags/*:refs/tags/*\"`，那么被删除的就不是过时的远程跟踪分支，而是远程上不存在的任何本地标签。"
 #. type: Plain text
 #: en/git-fetch.txt:150
 #, priority:220
 msgid "This might not be what you expect, i.e. you want to prune remote `<name>`, but also explicitly fetch tags from it, so when you fetch from it you delete all your local tags, most of which may not have come from the `<name>` remote in the first place."
-msgstr ""
+msgstr "这可能不是你所期望的，即你想修剪远程的 `<名称>`，但也明确地从它那里获取标签，所以当你从它那里获取时，你会删除所有的本地标签，其中大部分可能首先不是来自远程的 `<名称>`。"
 #. type: Plain text
 #: en/git-fetch.txt:154
 #, priority:220
 msgid "So be careful when using this with a refspec like `refs/tags/*:refs/tags/*`, or any other refspec which might map references from multiple remotes to the same local namespace."
-msgstr ""
+msgstr "因此，当与 `refs/tags/*:refs/tags/*` 这样的引用规范一起使用时要小心，或者任何其他可能将多个远程的引用映射到同一本地命名空间的引用规范。"
 #. type: Plain text
 #: en/git-fetch.txt:161
 #, priority:220
 msgid "Since keeping up-to-date with both branches and tags on the remote is a common use-case the `--prune-tags` option can be supplied along with `--prune` to prune local tags that don't exist on the remote, and force-update those tags that differ. Tag pruning can also be enabled with `fetch.pruneTags` or `remote.<name>.pruneTags` in the config. See linkgit:git-config[1]."
-msgstr ""
+msgstr "由于在远程保持最新的分支和标签是一个常见的使用情况，`--prune-tags` 选项可以和 `--prune` 一起使用，以修剪在远程不存在的本地标签，并强制更新那些不同的标签。标签修剪也可以通过配置中的 `fetch.pruneTags` 或 `remote.<名称>.pruneTags` 启用。见linkgit:git-config[1]。"
 #. type: Plain text
 #: en/git-fetch.txt:165
 #, priority:220
 msgid "The `--prune-tags` option is equivalent to having `refs/tags/*:refs/tags/*` declared in the refspecs of the remote. This can lead to some seemingly strange interactions:"
-msgstr ""
+msgstr "`--prune-tags` 选项相当于在远程的引用规范中声明 `refs/tags/*:refs/tags/*` 。这可能会导致一些看起来很奇怪的结果："
 #. type: delimited block -
 #: en/git-fetch.txt:170
@@ -25081,25 +25069,25 @@ msgid ""
 "# These both fetch tags\n"
 "$ git fetch --no-tags origin 'refs/tags/*:refs/tags/*'\n"
 "$ git fetch --no-tags --prune-tags origin\n"
-msgstr ""
+msgstr "# 这两个命令都可以用来获取标签\n$ git fetch --no-tags origin 'refs/tags/*:refs/tags/*'\n$ git fetch --no-tags --prune-tags origin\n"
 #. type: Plain text
 #: en/git-fetch.txt:176
 #, priority:220
 msgid "The reason it doesn't error out when provided without `--prune` or its config versions is for flexibility of the configured versions, and to maintain a 1=1 mapping between what the command line flags do, and what the configuration versions do."
-msgstr ""
+msgstr "在没有 `--prune` 或其配置的情况下，它不会出错的原因是为了配置的灵活性，以及在命令行标志和配置之间保持 1=1 的映射。"
 #. type: Plain text
 #: en/git-fetch.txt:181
 #, priority:220
 msgid "It's reasonable to e.g. configure `fetch.pruneTags=true` in `~/.gitconfig` to have tags pruned whenever `git fetch --prune` is run, without making every invocation of `git fetch` without `--prune` an error."
-msgstr ""
+msgstr "例如，在 `~/.gitconfig` 中配置 `fetch.pruneTags=true`，以便在运行 `git fetch --prune` 时修剪标签，这是很合理的，不会使每次调用 `git fetch` 而没有 `--prune` 时都出现错误。"
 #. type: Plain text
 #: en/git-fetch.txt:185
 #, priority:220
 msgid "Pruning tags with `--prune-tags` also works when fetching a URL instead of a named remote. These will all prune tags not found on origin:"
-msgstr ""
+msgstr "使用 `--prune-tags` 修剪标签，在获取一个URL而不是一个命名的远程时也能发挥作用。这些都会修剪在原点没有发现的标签："
 #. type: delimited block -
 #: en/git-fetch.txt:191
@@ -25119,13 +25107,13 @@ msgstr ""
 #: en/git-fetch.txt:199
 #, priority:220
 msgid "The output of \"git fetch\" depends on the transport method used; this section describes the output when fetching over the Git protocol (either locally or via ssh) and Smart HTTP protocol."
-msgstr ""
+msgstr "\"git fetch\" 的输出取决于所使用的传输方式；本节描述了通过 Git 协议（本地或通过 ssh）和智能 HTTP 协议获取时的输出。"
 #. type: Plain text
 #: en/git-fetch.txt:202
 #, priority:220
 msgid "The status of the fetch is output in tabular form, with each line representing the status of a single ref. Each line is of the form:"
-msgstr ""
+msgstr "获取的状态以表格的形式输出，每一行代表一个引用的状态。每一行的形式是："
 #. type: delimited block -
 #: en/git-fetch.txt:205
@@ -25137,25 +25125,25 @@ msgstr " <flag> <summary> <from> -> <to> [<reason>]\n"
 #: en/git-fetch.txt:211
 #, priority:220
 msgid "When using `--porcelain`, the output format is intended to be machine-parseable. In contrast to the human-readable output formats it thus prints to standard output instead of standard error. Each line is of the form:"
-msgstr ""
+msgstr "当使用 `--porcelain` 时，输出格式的目的是让机器可以解析。与人类可读的输出格式不同，它将打印到标准输出而不是标准错误。每一行都是这样的形式："
 #. type: delimited block -
 #: en/git-fetch.txt:214
 #, no-wrap, priority:220
 msgid "<flag> <old-object-id> <new-object-id> <local-reference>\n"
-msgstr ""
+msgstr "<标志> <旧对象ID> <新对象ID> <本地引用>\n"
 #. type: Plain text
 #: en/git-fetch.txt:218
 #, priority:220
 msgid "The status of up-to-date refs is shown only if the --verbose option is used."
-msgstr ""
+msgstr "只有在使用 --verbose 选项时，才会显示最新的引用状态。"
 #. type: Plain text
 #: en/git-fetch.txt:223
 #, priority:220
 msgid "In compact output mode, specified with configuration variable fetch.output, if either entire `<from>` or `<to>` is found in the other string, it will be substituted with `*` in the other string. For example, `master -> origin/master` becomes `master -> origin/*`."
-msgstr ""
+msgstr "在紧凑输出模式下，通过配置变量 fetch.output 指定，如果在另一个字符串中发现整个 `<起点>` 或 `<终点>`，它将被替换成另一个字符串中的 `*`。例如，`master -> origin/master` 变成 `master -> origin/*`。"
 #. type: Labeled list
 #: en/git-fetch.txt:224 en/git-push.txt:460
@@ -25167,19 +25155,19 @@ msgstr "标记"
 #: en/git-fetch.txt:226 en/git-push.txt:462
 #, priority:220
 msgid "A single character indicating the status of the ref:"
-msgstr ""
+msgstr "表示引用状态的单个字符："
 #. type: Labeled list
 #: en/git-fetch.txt:226 en/git-push.txt:462
 #, no-wrap, priority:220
 msgid "(space)"
-msgstr ""
+msgstr "（空格）"
 #. type: Plain text
 #: en/git-fetch.txt:227
 #, priority:220
 msgid "for a successfully fetched fast-forward;"
-msgstr ""
+msgstr "表示成功的快速合并；"
 #. type: Labeled list
 #: en/git-fetch.txt:227 en/git-push.txt:463
@@ -25191,7 +25179,7 @@ msgstr "`+`"
 #: en/git-fetch.txt:228 en/git-push.txt:464
 #, priority:220
 msgid "for a successful forced update;"
-msgstr ""
+msgstr "表示一个成功的强制更新；"
 #. type: Labeled list
 #: en/git-fetch.txt:228 en/git-push.txt:464
@@ -25203,7 +25191,7 @@ msgstr "`-`"
 #: en/git-fetch.txt:229
 #, priority:220
 msgid "for a successfully pruned ref;"
-msgstr ""
+msgstr "表示成功修剪引用；"
 #. type: Labeled list
 #: en/git-fetch.txt:229
@@ -25215,7 +25203,7 @@ msgstr "`t`"
 #: en/git-fetch.txt:230
 #, priority:220
 msgid "for a successful tag update;"
-msgstr ""
+msgstr "表示成功更新标签；"
 #. type: Labeled list
 #: en/git-fetch.txt:230 en/git-push.txt:465
@@ -25227,7 +25215,7 @@ msgstr "`*`"
 #: en/git-fetch.txt:231
 #, priority:220
 msgid "for a successfully fetched new ref;"
-msgstr ""
+msgstr "表示成功获取新引用；"
 #. type: Labeled list
 #: en/git-fetch.txt:231 en/git-push.txt:466
@@ -25239,7 +25227,7 @@ msgstr "`!`"
 #: en/git-fetch.txt:232
 #, priority:220
 msgid "for a ref that was rejected or failed to update; and"
-msgstr ""
+msgstr "表示被拒绝或更新失败的引用；以及"
 #. type: Labeled list
 #: en/git-fetch.txt:232 en/git-push.txt:467
@@ -25251,7 +25239,7 @@ msgstr "`=`"
 #: en/git-fetch.txt:233
 #, priority:220
 msgid "for a ref that was up to date and did not need fetching."
-msgstr ""
+msgstr "表示一个最新的、不需要获取的引用。"
 #. type: Labeled list
 #: en/git-fetch.txt:234 en/git-push.txt:469
@@ -25263,7 +25251,7 @@ msgstr "总结"
 #: en/git-fetch.txt:239
 #, ignore-ellipsis, priority:220
 msgid "For a successfully fetched ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)."
-msgstr ""
+msgstr "对于一个成功获取的引用，摘要以适合作为 `git log` 参数的形式显示该引用的新旧值（在大多数情况下是 `<旧>..<新>`，对于强制非快速合并是 `<旧>...<新>`）。"
 #. type: Labeled list
 #: en/git-fetch.txt:240 en/git-push.txt:497
@@ -25275,7 +25263,7 @@ msgstr "从"
 #: en/git-fetch.txt:244
 #, priority:220
 msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` prefix. In the case of deletion, the name of the remote ref is \"(none)\"."
-msgstr ""
+msgstr "被获取的远程引用的名称，减去其`refs/<类型>/`前缀。在删除的情况下，远程引用的名称是 \"(none)\"。"
 #. type: Labeled list
 #: en/git-fetch.txt:245 en/git-push.txt:502
@@ -25287,7 +25275,7 @@ msgstr "到"
 #: en/git-fetch.txt:248
 #, priority:220
 msgid "The name of the local ref being updated, minus its `refs/<type>/` prefix."
-msgstr ""
+msgstr "被更新的本地引用的名称，去掉其 `refs/<类型>/` 前缀。"
 #. type: Labeled list
 #: en/git-fetch.txt:249 en/git-push.txt:506
@@ -25299,13 +25287,13 @@ msgstr "原因"
 #: en/git-fetch.txt:253
 #, priority:220
 msgid "A human-readable explanation. In the case of successfully fetched refs, no explanation is needed. For a failed ref, the reason for failure is described."
-msgstr ""
+msgstr "一个人类可读的解释。如果是成功获取的引用，不需要解释。对于失败的引用，将描述失败的原因。"
 #. type: Plain text
 #: en/git-fetch.txt:258
 #, priority:220
 msgid "Update the remote-tracking branches:"
-msgstr ""
+msgstr "更新远程追踪的分支："
 #. type: delimited block -
 #: en/git-fetch.txt:261
@@ -25317,13 +25305,13 @@ msgstr "$ git fetch origin\n"
 #: en/git-fetch.txt:267
 #, priority:220
 msgid "The above command copies all branches from the remote `refs/heads/` namespace and stores them to the local `refs/remotes/origin/` namespace, unless the `remote.<repository>.fetch` option is used to specify a non-default refspec."
-msgstr ""
+msgstr "上述命令从远程的 `refs/heads/` 命名空间复制所有分支，并存储到本地的 `refs/remotes/origin/` 命名空间，除非使用 `remote.<仓库>.fetch` 选项来指定一个非默认的引用规范。"
 #. type: Plain text
 #: en/git-fetch.txt:269
 #, priority:220
 msgid "Using refspecs explicitly:"
-msgstr ""
+msgstr "明确使用引用规范："
 #. type: delimited block -
 #: en/git-fetch.txt:272
@@ -25335,19 +25323,19 @@ msgstr "$ git fetch origin +seen:seen maint:tmp\n"
 #: en/git-fetch.txt:277
 #, priority:220
 msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
-msgstr ""
+msgstr "这通过从远程存储库的分支（分别）获取 `seen` 和 `maint` 来更新（或根据需要创建）本地存储库中的分支 `seen` 和 `tmp`。"
 #. type: Plain text
 #: en/git-fetch.txt:280
 #, priority:220
 msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
-msgstr ""
+msgstr "即使不快进，`seen` 分支也会被更新，因为它的前缀是加号；`tmp` 则不会。"
 #. type: Plain text
 #: en/git-fetch.txt:283
 #, priority:220
 msgid "Peek at a remote's branch, without configuring the remote in your local repository:"
-msgstr ""
+msgstr "窥视一个远程的分支，而不需要在你的本地版本库中配置远程："
 #. type: delimited block -
 #: en/git-fetch.txt:287
@@ -25355,19 +25343,19 @@ msgstr ""
 msgid ""
 "$ git fetch git://git.kernel.org/pub/scm/git/git.git maint\n"
 "$ git log FETCH_HEAD\n"
-msgstr ""
+msgstr "$ git fetch git://git.kernel.org/pub/scm/git/git.git maint\n$ git log FETCH_HEAD\n"
 #. type: Plain text
 #: en/git-fetch.txt:294
 #, priority:220
 msgid "The first command fetches the `maint` branch from the repository at `git://git.kernel.org/pub/scm/git/git.git` and the second command uses `FETCH_HEAD` to examine the branch with linkgit:git-log[1].  The fetched objects will eventually be removed by git's built-in housekeeping (see linkgit:git-gc[1])."
-msgstr ""
+msgstr "第一条命令从 `git://git.kernel.org/pub/scm/git.git` 的存储库中获取 `maint` 分支，第二条命令使用 `FETCH_HEAD` 用 linkgit:git-log[1] 来检查该分支。  取出的对象最终会被 git 内置的内务管理删除（见 linkgit:git-gc[1]）。"
 #. type: Plain text
 #: en/git-fetch.txt:310
 #, priority:220
 msgid "Using --recurse-submodules can only fetch new commits in submodules that are present locally e.g. in `$GIT_DIR/modules/`. If the upstream adds a new submodule, that submodule cannot be fetched until it is cloned e.g. by `git submodule update`. This is expected to be fixed in a future Git version."
-msgstr ""
+msgstr "使用 --recurse-submodules 只能获取本地存在的子模块中的新提交，例如在 `$GIT_DIR/modules/`。如果上游添加了一个新的子模块，该子模块不能被获取，直到它被克隆，例如，通过`git submodule update`。这个问题有望在未来的 Git 版本中被修复。"
 #. type: Title =
 #: en/git-filter-branch.txt:2
@@ -31010,7 +30998,7 @@ msgstr ""
 #: en/git-http-push.txt:39 en/git-push.txt:176 en/git-send-pack.txt:54
 #, priority:220
 msgid "Do everything except actually send the updates."
-msgstr ""
+msgstr "做除了实际发送更新外的所有事。"
 #. type: Plain text
 #: en/git-http-push.txt:43
@@ -40086,25 +40074,25 @@ msgstr "'git pull' [<options>] [<repository> [<refspec>...]]\n"
 #: en/git-pull.txt:24
 #, priority:220
 msgid "Incorporates changes from a remote repository into the current branch.  If the current branch is behind the remote, then by default it will fast-forward the current branch to match the remote.  If the current branch and the remote have diverged, the user needs to specify how to reconcile the divergent branches with `--rebase` or `--no-rebase` (or the corresponding configuration option in `pull.rebase`)."
-msgstr ""
+msgstr "将远程版本库的修改并入当前分支。 如果当前分支落后于远程分支，那么默认情况下，它将快速合并当前分支以匹配远程分支。 如果当前分支和远程分支有分歧，用户需要用 `--rebase` 或 `--no-rebase`（或 `pull.rebase` 中的相应配置选项）来指定如何调和分歧的分支。"
 #. type: Plain text
 #: en/git-pull.txt:29
 #, priority:220
 msgid "More precisely, `git pull` runs `git fetch` with the given parameters and then depending on configuration options or command line flags, will call either `git rebase` or `git merge` to reconcile diverging branches."
-msgstr ""
+msgstr "更确切地说，`git pull` 运行 `git fetch` 并给出参数，然后根据配置选项或命令行标志，调用 `git rebase` 或 `git merge` 来协调不同的分支。"
 #. type: Plain text
 #: en/git-pull.txt:36
 #, priority:220
 msgid "<repository> should be the name of a remote repository as passed to linkgit:git-fetch[1].  <refspec> can name an arbitrary remote ref (for example, the name of a tag) or even a collection of refs with corresponding remote-tracking branches (e.g., refs/heads/{asterisk}:refs/remotes/origin/{asterisk}), but usually it is the name of a branch in the remote repository."
-msgstr ""
+msgstr "<仓库> 应该是传递给 linkgit:git-fetch [1] 的远程仓库的名称。 < 用引规范 > 可以命名一个任意的远程引用（例如，一个标签的名称），甚至是一个有相应远程跟踪分支的引用集合（例如，refs/heads/{asterisk}:refs/remotes/origin/{asterisk}），但通常它是远程仓库的一个分支名称。"
 #. type: Plain text
 #: en/git-pull.txt:40
 #, priority:220
 msgid "Default values for <repository> and <branch> are read from the \"remote\" and \"merge\" configuration for the current branch as set by linkgit:git-branch[1] `--track`."
-msgstr ""
+msgstr "<仓库> 和 < 分支 > 的默认值是从 linkgit:git-branch [1] `--track` 设置的当前分支的 \"远程\" 和 \"合并\" 配置中读取。"
 #. type: delimited block -
 #: en/git-pull.txt:50
@@ -40115,13 +40103,13 @@ msgid ""
 "    D---E---F---G master\n"
 "\t^\n"
 "\torigin/master in your repository\n"
-msgstr ""
+msgstr "\t  A---B---C master on origin\n\t /\n    D---E---F---G master\n\t^\n\t你仓库中的 origin/master\n"
 #. type: Plain text
 #: en/git-pull.txt:57
 #, priority:220
 msgid "Then \"`git pull`\" will fetch and replay the changes from the remote `master` branch since it diverged from the local `master` (i.e., `E`)  until its current commit (`C`) on top of `master` and record the result in a new commit along with the names of the two parent commits and a log message from the user describing the changes."
-msgstr ""
+msgstr "然后，\"`git pull`\" 将从远程的 `master` 分支获取并重放自它与本地 `master`（即 `E`）分歧以来的变化，直到它在 `master` 之上的当前提交（`C`），并将结果与两个父提交的名称和用户描述变化的日志信息一起记录在一个新提交中。"
 #. type: delimited block -
 #: en/git-pull.txt:62
@@ -40130,37 +40118,37 @@ msgid ""
 "\t  A---B---C origin/master\n"
 "\t /         \\\n"
 "    D---E---F---G---H master\n"
-msgstr ""
+msgstr "\t  A---B---C origin/master\n\t /         \\\n    D---E---F---G---H master\n"
 #. type: Plain text
 #: en/git-pull.txt:66
 #, priority:220
 msgid "See linkgit:git-merge[1] for details, including how conflicts are presented and handled."
-msgstr ""
+msgstr "详情见 linkgit:git-merge[1]，包括如何呈现和处理冲突。"
 #. type: Plain text
 #: en/git-pull.txt:71
 #, priority:220
 msgid "In Git 1.7.0 or later, to cancel a conflicting merge, use `git reset --merge`.  *Warning*: In older versions of Git, running 'git pull' with uncommitted changes is discouraged: while possible, it leaves you in a state that may be hard to back out of in the case of a conflict."
-msgstr ""
+msgstr "在 Git 1.7.0 或更高版本中，要取消一个冲突的合并，请使用 `git reset --merge`。 * 警告 *：在旧版本的 Git 中，不鼓励在未提交的情况下运行 \"git pull\"：虽然有可能，但在发生冲突的情况下，会让你处于一个难以恢复的状态。"
 #. type: Plain text
 #: en/git-pull.txt:76
 #, priority:220
 msgid "If any of the remote changes overlap with local uncommitted changes, the merge will be automatically canceled and the work tree untouched.  It is generally best to get any local changes in working order before pulling or stash them away with linkgit:git-stash[1]."
-msgstr ""
+msgstr "如果任何远程修改与本地未提交的修改重叠，合并将被自动取消，工作目录树不会被改动。  一般来说，最好是在拉取之前把任何本地的修改弄到工作状态，或者用 linkgit:git-stash[1] 把它们贮藏起来。"
 #. type: Plain text
 #: en/git-pull.txt:85
 #, priority:220
 msgid "This is passed to both underlying git-fetch to squelch reporting of during transfer, and underlying git-merge to squelch output during merging."
-msgstr ""
+msgstr "这将被传递给底层的 git-fetch，以便在传输过程中抑制报告，以及底层的 git-merge，以便在合并过程中抑制输出。"
 #. type: Plain text
 #: en/git-pull.txt:89
 #, priority:220
 msgid "Pass --verbose to git-fetch and git-merge."
-msgstr ""
+msgstr "将 --verbose 传给 git-fetch 和 git-merge。"
 #. type: Labeled list
 #: en/git-pull.txt:90
@@ -40172,25 +40160,25 @@ msgstr "--[no-]recurse-submodules[=yes|on-demand|no]"
 #: en/git-pull.txt:95
 #, priority:220
 msgid "This option controls if new commits of populated submodules should be fetched, and if the working trees of active submodules should be updated, too (see linkgit:git-fetch[1], linkgit:git-config[1] and linkgit:gitmodules[5])."
-msgstr ""
+msgstr "这个选项控制是否应该获取已填充子模块的新提交，以及是否应该更新活动子模块的工作树（见linkgit:git-fetch[1], linkgit:git-config[1] 和 linkgit:gitmodules[5]）。"
 #. type: Plain text
 #: en/git-pull.txt:97
 #, priority:220
 msgid "If the checkout is done via rebase, local submodule commits are rebased as well."
-msgstr ""
+msgstr "如果签出是通过变基完成的，那么本地子模块的提交也会被变基。"
 #. type: Plain text
 #: en/git-pull.txt:99
 #, priority:220
 msgid "If the update is done via merge, the submodule conflicts are resolved and checked out."
-msgstr ""
+msgstr "如果更新是通过合并完成的，子模块的冲突就会被解决并被检查出来。"
 #. type: Title ~
 #: en/git-pull.txt:101
 #, no-wrap, priority:220
 msgid "Options related to merging"
-msgstr ""
+msgstr "与合并有关的选项"
 #. type: Labeled list
 #: en/git-pull.txt:108
@@ -40202,13 +40190,13 @@ msgstr "--preserve-merges and --interactive"
 #: en/git-pull.txt:114
 #, priority:220
 msgid "When true, rebase the current branch on top of the upstream branch after fetching. If there is a remote-tracking branch corresponding to the upstream branch and the upstream branch was rebased since last fetched, the rebase uses that information to avoid rebasing non-local changes."
-msgstr ""
+msgstr "为真时，在获取后将当前分支变基到上游分支之上。如果有一个远程跟踪的分支与上游分支相对应，并且上游分支在上次获取后被重新建立了基础，那么变基就会使用该信息以避免重新建立非本地的变化。"
 #. type: Plain text
 #: en/git-pull.txt:118
 #, priority:220
 msgid "When set to `merges`, rebase using `git rebase --rebase-merges` so that the local merge commits are included in the rebase (see linkgit:git-rebase[1] for details)."
-msgstr ""
+msgstr "当设置为 `merges` 时，使用 `git rebase --rebase-merges` 进行重建，这样本地的合并提交就会包含在重建中（详见 linkgit:git-rebase [1]）。"
 #. type: Plain text
 #: en/git-pull.txt:120
@@ -40220,19 +40208,19 @@ msgstr "如果为false，则将上游分支合并到当前分支中。"
 #: en/git-pull.txt:122
 #, priority:220
 msgid "When `interactive`, enable the interactive mode of rebase."
-msgstr ""
+msgstr "当设置为 `interactive` 时，启用变基的交互模式。"
 #. type: Plain text
 #: en/git-pull.txt:126
 #, priority:220
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
-msgstr ""
+msgstr "如果你想让 `git pull` 总是使用 `--rebase` 而不是合并，请参见 linkgit:git-config [1] 中的 `pull.rebase`, `branch.< 分支名 >.rebase` 和 `branch.autoSetupRebase`。"
 #. type: Plain text
 #: en/git-pull.txt:132
 #, priority:220
 msgid "This is a potentially _dangerous_ mode of operation.  It rewrites history, which does not bode well when you published that history already.  Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
-msgstr ""
+msgstr "这是一种潜在的「危险的」操作模式。  它重写了历史，当你已经发布了这些历史时，这并不是一个好兆头。  除非你仔细阅读了linkgit:git-rebase[1]，否则请「不要」使用这个选项。"
 #. type: Labeled list
 #: en/git-pull.txt:133 en/git-svn.txt:261
@@ -40244,73 +40232,73 @@ msgstr "--no-rebase"
 #: en/git-pull.txt:135
 #, priority:220
 msgid "This is shorthand for --rebase=false."
-msgstr ""
+msgstr "这是对 --rebase=false 的简写。"
 #. type: Title ~
 #: en/git-pull.txt:137
 #, no-wrap, priority:220
 msgid "Options related to fetching"
-msgstr ""
+msgstr "与获取有关的选项"
 #. type: Title -
 #: en/git-pull.txt:148
 #, no-wrap, priority:220
 msgid "DEFAULT BEHAVIOUR"
-msgstr ""
+msgstr "默认行为"
 #. type: Plain text
 #: en/git-pull.txt:155
 #, priority:220
 msgid "Often people use `git pull` without giving any parameter.  Traditionally, this has been equivalent to saying `git pull origin`.  However, when configuration `branch.<name>.remote` is present while on branch `<name>`, that value is used instead of `origin`."
-msgstr ""
+msgstr "人们经常使用 `git pull` 而不给任何参数。 传统上，这等同于说 `git pull origin`。 然而，当配置 `branch.<分支名>.remote` 在分支 `< 分支名 >` 上出现时，该值会被用来代替 `origin`。"
 #. type: Plain text
 #: en/git-pull.txt:160
 #, priority:220
 msgid "In order to determine what URL to use to fetch from, the value of the configuration `remote.<origin>.url` is consulted and if there is not any such variable, the value on the `URL:` line in `$GIT_DIR/remotes/<origin>` is used."
-msgstr ""
+msgstr "为了确定使用什么 URL 来获取，将查询配置 `remote.<远程名>.url` 的值，如果没有这样的变量，将使用 `$GIT_DIR/remotes/< 远程名 >` 中 `URL:` 一行的值。"
 #. type: Plain text
 #: en/git-pull.txt:169
 #, priority:220
 msgid "In order to determine what remote branches to fetch (and optionally store in the remote-tracking branches) when the command is run without any refspec parameters on the command line, values of the configuration variable `remote.<origin>.fetch` are consulted, and if there aren't any, `$GIT_DIR/remotes/<origin>` is consulted and its `Pull:` lines are used.  In addition to the refspec formats described in the OPTIONS section, you can have a globbing refspec that looks like this:"
-msgstr ""
+msgstr "当命令行上没有任何引用规范参数时，为了确定要获取哪些远程分支（并可选择存储在远程跟踪分支中），会查询配置变量 `remote.<远程名>.fetch` 的值，如果没有，会查询 `$GIT_DIR/remotes/< 远程名 >` 并使用其 `Pull:` 行。 除了在『选项』部分描述的引用规范格式之外，你还可以有一个看起来像这样的引用规范通配符："
 #. type: delimited block -
 #: en/git-pull.txt:172
 #, no-wrap, priority:220
 msgid "refs/heads/*:refs/remotes/origin/*\n"
-msgstr ""
+msgstr "refs/heads/*:refs/remotes/origin/*\n"
 #. type: Plain text
 #: en/git-pull.txt:179
 #, priority:220
 msgid "A globbing refspec must have a non-empty RHS (i.e. must store what were fetched in remote-tracking branches), and its LHS and RHS must end with `/*`.  The above specifies that all remote branches are tracked using remote-tracking branches in `refs/remotes/origin/` hierarchy under the same name."
-msgstr ""
+msgstr "一个引用规范通配符必须有一个非空的 RHS（即必须存储在远程跟踪分支中获取的内容），其 LHS 和 RHS 必须以 `/*` 结尾。 以上规定了所有远程分支都使用同名的 `refs/remotes/origin/` 层次结构中的远程跟踪分支进行跟踪。"
 #. type: Plain text
 #: en/git-pull.txt:183
 #, priority:220
 msgid "The rule to determine which remote branch to merge after fetching is a bit involved, in order not to break backward compatibility."
-msgstr ""
+msgstr "为了不破坏后向兼容性，确定在获取后合并哪个远程分支的规则有点复杂。"
 #. type: Plain text
 #: en/git-pull.txt:186
 #, priority:220
 msgid "If explicit refspecs were given on the command line of `git pull`, they are all merged."
-msgstr ""
+msgstr "如果在 `git pull` 的命令行中给出了明确的引用规范，它们都会被合并。"
 #. type: Plain text
 #: en/git-pull.txt:191
 #, priority:220
 msgid "When no refspec was given on the command line, then `git pull` uses the refspec from the configuration or `$GIT_DIR/remotes/<origin>`.  In such cases, the following rules apply:"
-msgstr ""
+msgstr "当命令行没有给出引用规范时，那么 `git pull` 使用配置或 `$GIT_DIR/remotes/<远程名>` 中的引用规范。 在这种情况下，以下规则适用："
 #. type: Plain text
 #: en/git-pull.txt:195
 #, priority:220
 msgid "If `branch.<name>.merge` configuration for the current branch `<name>` exists, that is the name of the branch at the remote site that is merged."
-msgstr ""
+msgstr "如果当前分支 `<分支名>` 的 `branch.< 分支名 >.merge` 配置存在，这就是被合并的远程站点的分支名称。"
 #. type: Plain text
 #: en/git-pull.txt:197
@@ -40322,13 +40310,13 @@ msgstr "如果 refspec 是全局的， 则不合并任何信息。"
 #: en/git-pull.txt:199
 #, priority:220
 msgid "Otherwise the remote branch of the first refspec is merged."
-msgstr ""
+msgstr "否则将合并第一个引用规范的远程分支。"
 #. type: Plain text
 #: en/git-pull.txt:207
 #, priority:220
 msgid "Update the remote-tracking branches for the repository you cloned from, then merge one of them into your current branch:"
-msgstr ""
+msgstr "更新你所克隆的仓库的远程跟踪分支，然后将其中一个分支合并到你当前的分支："
 #. type: delimited block -
 #: en/git-pull.txt:211
@@ -40344,13 +40332,13 @@ msgstr ""
 #: en/git-pull.txt:216
 #, priority:220
 msgid "Normally the branch merged in is the HEAD of the remote repository, but the choice is determined by the branch.<name>.remote and branch.<name>.merge options; see linkgit:git-config[1] for details."
-msgstr ""
+msgstr "通常情况下，合并进来的分支是远程仓库的 HEAD，但选择由 branch.<分支名>.remote 和 branch.< 分支名 >.merge 选项决定；详见 linkgit:git-config[1] 。"
 #. type: Plain text
 #: en/git-pull.txt:218
 #, priority:220
 msgid "Merge into the current branch the remote branch `next`:"
-msgstr ""
+msgstr "将远程分支 `next` 合并到当前分支："
 #. type: delimited block -
 #: en/git-pull.txt:221
@@ -40362,7 +40350,7 @@ msgstr "$ git pull origin next\n"
 #: en/git-pull.txt:226
 #, priority:220
 msgid "This leaves a copy of `next` temporarily in FETCH_HEAD, and updates the remote-tracking branch `origin/next`.  The same can be done by invoking fetch and merge:"
-msgstr ""
+msgstr "这将在 FETCH_HEAD 中暂时留下 `next` 的副本，并更新远程跟踪分支 `origin/next`。 同样可以通过调用 fetch 和 merge 来完成："
 #. type: delimited block -
 #: en/git-pull.txt:230
@@ -40378,13 +40366,13 @@ msgstr ""
 #: en/git-pull.txt:235
 #, priority:220
 msgid "If you tried a pull which resulted in complex conflicts and would want to start over, you can recover with 'git reset'."
-msgstr ""
+msgstr "如果你尝试了一次拉取，导致了复杂的冲突，想重新开始，你可以用 'git reset' 来恢复。"
 #. type: Plain text
 #: en/git-pull.txt:247
 #, priority:220
 msgid "Using --recurse-submodules can only fetch new commits in already checked out submodules right now. When e.g. upstream added a new submodule in the just fetched commits of the superproject the submodule itself cannot be fetched, making it impossible to check out that submodule later without having to do a fetch again. This is expected to be fixed in a future Git version."
-msgstr ""
+msgstr "使用 --recurse-submodules 现在只能获取已经签出的子模块的新提交。例如，当上游在刚刚获取的超级项目的提交中添加了一个新的子模块时，子模块本身不能被获取，这使得以后不需要再次获取就能签出该子模块。这个问题有望在未来的 Git 版本中被修复。"
 #. type: Plain text
 #: en/git-pull.txt:251
@@ -40402,7 +40390,7 @@ msgstr "git-push(1)"
 #: en/git-push.txt:7
 #, priority:220
 msgid "git-push - Update remote refs along with associated objects"
-msgstr ""
+msgstr "git-push - 与相关对象一起更新远程分支引用"
 #. type: Plain text
 #: en/git-push.txt:18
@@ -40414,49 +40402,49 @@ msgid ""
 "\t   [--[no-]signed|--signed=(true|false|if-asked)]\n"
 "\t   [--force-with-lease[=<refname>[:<expect>]] [--force-if-includes]]\n"
 "\t   [--no-verify] [<repository> [<refspec>...]]\n"
-msgstr ""
+msgstr "'git push' [--all | --branches | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]\n\t   [--repo=<仓库>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]\n\t   [-u | --set-upstream] [-o <字符串> | --push-option=<字符串>]\n\t   [--[no-]signed|--signed=(true|false|if-asked)]\n\t   [--force-with-lease[=<引用名>[:<expect>]] [--force-if-includes]]\n\t   [--no-verify] [<仓库> [<引用规范>...]]\n"
 #. type: Plain text
 #: en/git-push.txt:24
 #, priority:220
 msgid "Updates remote refs using local refs, while sending objects necessary to complete the given refs."
-msgstr ""
+msgstr "使用本地引用更新远程仓库引用，同时发送完成给定引用的必要对象。"
 #. type: Plain text
 #: en/git-push.txt:28
 #, priority:220
 msgid "You can make interesting things happen to a repository every time you push into it, by setting up 'hooks' there.  See documentation for linkgit:git-receive-pack[1]."
-msgstr ""
+msgstr "通过设置 “钩子”，你可以在每次推送到一个仓库时，让它发生有趣的事情。 见 linkgit:git-receive-pack[1] 的文档。"
 #. type: Plain text
 #: en/git-push.txt:33
 #, priority:220
 msgid "When the command line does not specify where to push with the `<repository>` argument, `branch.*.remote` configuration for the current branch is consulted to determine where to push.  If the configuration is missing, it defaults to 'origin'."
-msgstr ""
+msgstr "当命令行没有用 `<仓库>` 参数指定推送位置时，会参考当前分支的 `branch.*.remote` 配置来决定推送位置。 如果配置丢失，则默认为 \"origin\"。"
 #. type: Plain text
 #: en/git-push.txt:39
 #, ignore-ellipsis, priority:220
 msgid "When the command line does not specify what to push with `<refspec>...` arguments or `--all`, `--mirror`, `--tags` options, the command finds the default `<refspec>` by consulting `remote.*.push` configuration, and if it is not found, honors `push.default` configuration to decide what to push (See linkgit:git-config[1] for the meaning of `push.default`)."
-msgstr ""
+msgstr "当命令行没有用 `<引用规范>...` 参数或 `--all`、`--mirror`、`--tags` 选项指定推送内容时，命令通过查阅 `remote.*.push` 配置找到默认的 `< 引用规范 >`，如果没有找到，则以 `push.default` 配置决定推送内容（关于 `push.default` 的含义，见 linkgit：git-config[1] ）。"
 #. type: Plain text
 #: en/git-push.txt:46
 #, priority:220
 msgid "When neither the command-line nor the configuration specify what to push, the default behavior is used, which corresponds to the `simple` value for `push.default`: the current branch is pushed to the corresponding upstream branch, but as a safety measure, the push is aborted if the upstream branch does not have the same name as the local one."
-msgstr ""
+msgstr "当命令行和配置都没有指定推送的内容时，将使用默认行为，这与 `push.default` 的 `simple` 值相对应：当前分支被推送到相应的上游分支，但作为一项安全措施，如果上游分支的名称与本地分支不一致，推送将被中止。"
 #. type: Title -
 #: en/git-push.txt:49
 #, no-wrap, priority:220
 msgid "OPTIONS[[OPTIONS]]"
-msgstr ""
+msgstr "选项[[OPTIONS]]"
 #. type: Plain text
 #: en/git-push.txt:55
 #, priority:220
 msgid "The \"remote\" repository that is destination of a push operation.  This parameter can be either a URL (see the section <<URLS,GIT URLS>> below) or the name of a remote (see the section <<REMOTES,REMOTES>> below)."
-msgstr ""
+msgstr "作为推送操作的目的地的“远程”仓库。 这个参数可以是一个 URL（见下面 <<URLS,GIT URLS>> 一节），也可以是一个远程库的名称（见下面 <<远程仓库,REMOTES>> 一节）。"
 #. type: Labeled list
 #: en/git-push.txt:56
@@ -40468,37 +40456,37 @@ msgstr "<refspec>..."
 #: en/git-push.txt:61
 #, priority:220
 msgid "Specify what destination ref to update with what source object.  The format of a <refspec> parameter is an optional plus `+`, followed by the source object <src>, followed by a colon `:`, followed by the destination ref <dst>."
-msgstr ""
+msgstr "指定用什么源对象来更新哪个目标参考文献。 <引用规范> 参数的格式是一个可选的加号 `+`，后面是源对象 <src>，后面是冒号 `:`，后面是目标引用 <dst>。"
 #. type: Plain text
 #: en/git-push.txt:65
 #, priority:220
 msgid "The <src> is often the name of the branch you would want to push, but it can be any arbitrary \"SHA-1 expression\", such as `master~4` or `HEAD` (see linkgit:gitrevisions[7])."
-msgstr ""
+msgstr "<src> 通常是你想推送的分支的名字，但它可以是任何任意的“SHA-1 表达式”，比如 `master~4` 或 `HEAD`（见 linkgit:gitrevisions [7]）。"
 #. type: Plain text
 #: en/git-push.txt:75
 #, priority:220
 msgid "The <dst> tells which ref on the remote side is updated with this push. Arbitrary expressions cannot be used here, an actual ref must be named.  If `git push [<repository>]` without any `<refspec>` argument is set to update some ref at the destination with `<src>` with `remote.<repository>.push` configuration variable, `:<dst>` part can be omitted--such a push will update a ref that `<src>` normally updates without any `<refspec>` on the command line.  Otherwise, missing `:<dst>` means to update the same ref as the `<src>`."
-msgstr ""
+msgstr "<dst> 远程仓库的哪个引用被这个推送更新。这里不能使用任意的表达式，必须命名一个实际的引用。 如果 `git push [< 仓库 >]` 没有任何 `< 引用规范 >` 参数被设置用 `remote.< 仓库 >.push` 配置变量更新目的地 `<src>` 的某个引用，则`:<dst>` 部分可以省略 —— 这样的推送将更新 `<src>` 通常更新的引用，命令行上没有任何 `< 引用规范 >`。 否则，缺少 `:<dst>` 意味着更新与 `<src>` 相同的引用。"
 #. type: Plain text
 #: en/git-push.txt:80
 #, priority:220
 msgid "If <dst> doesn't start with `refs/` (e.g. `refs/heads/master`) we will try to infer where in `refs/*` on the destination <repository> it belongs based on the type of <src> being pushed and whether <dst> is ambiguous."
-msgstr ""
+msgstr "如果 <dst> 不是以 `refs/` 开头（例如 `refs/heads/master`），我们将根据被推送的 <src> 的类型和 <dst> 是否含糊不清，尝试推断它在目的地 < 仓库 > 的 `refs/*` 中的位置。"
 #. type: Plain text
 #: en/git-push.txt:84
 #, priority:220
 msgid "If <dst> unambiguously refers to a ref on the <repository> remote, then push to that ref."
-msgstr ""
+msgstr "如果 <dst> 明确地指向 < 仓库 > 远程的一个引用，那么就推送到该引用。"
 #. type: Plain text
 #: en/git-push.txt:87
 #, priority:220
 msgid "If <src> resolves to a ref starting with refs/heads/ or refs/tags/, then prepend that to <dst>."
-msgstr ""
+msgstr "如果 <src> 解析为以 refs/heads/ 或 refs/tags/ 开头的引用，则将其前置到 <dst>。"
 #. type: Plain text
 #: en/git-push.txt:93
@@ -68253,7 +68241,7 @@ msgstr "--object-names"
 #: en/rev-list-options.txt:929
 #, priority:260
 msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior. Note that the \"name\" of each object is ambiguous, and mostly intended as a hint for packing objects. In particular: no distinction is made between the names of tags, trees, and blobs; path names may be modified to remove newlines; and if an object would appear multiple times with different names, only one name is shown."
-msgstr ""
+msgstr "只对 `--objects` 有用；打印找到的对象ID的名称。这是默认的行为。注意，每个对象的 \"名字\" 是模糊的，主要是作为打包对象的提示。特别是：标签、树和二进制文件的名字不作区分；路径名称可以被修改以删除换行；如果一个对象会以不同的名字出现多次，则只显示一个名字。"
 #. type: Labeled list
 #: en/rev-list-options.txt:930