documentation.zh_HANS-CN.po

msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents).  When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
msgstr "当用 `git diff-tree -c` 显示时，它将合并提交的父提交文件与合并结果进行比较（即文件 1 ... 文件 N 是父提交文件）。当用 `git diff-files -c` 显示时，它将两个未解决的合并父提交文件与工作树文件进行比较（即文件 1 是阶段 2 ，又称 \"我们的版本\"，文件 2 是阶段 3，又称 \"他们的版本\"）。"

#. type: Labeled list
#: en/diff-options.txt:17 en/git-rebase.txt:420 en/merge-options.txt:109
#, ignore-same, no-wrap, priority:280
msgid "--no-stat"
msgstr "--no-stat"

#. type: Plain text
#: en/diff-options.txt:19
#, priority:280
msgid "Generate plain patches without any diffstats."
msgstr "生成没有任何差异状态(diffstats)的普通补丁。"

#. type: Labeled list
#: en/diff-options.txt:23 en/fetch-options.txt:264 en/git-add.txt:119 en/git-am.txt:92 en/git-checkout-index.txt:26 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:80 en/git-mailinfo.txt:54 en/git-push.txt:373 en/git-read-tree.txt:45 en/git-stash.txt:166
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"

#. type: Labeled list
#: en/diff-options.txt:24 en/git-add.txt:97 en/git-checkout.txt:274 en/git-commit.txt:74 en/git-restore.txt:49 en/git-stash.txt:197
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"

#. type: Plain text
#: en/diff-options.txt:26
#, fuzzy, priority:280
msgid "Generate patch (see section titled"
msgstr "生成补丁（参阅生成补丁的相关章节）。"

#. type: Plain text
#: en/diff-options.txt:28
#, priority:280
msgid "<<generate_patch_text_with_p, \"Generating patch text with -p\">>)."
msgstr "使用选项 `-p` 生成补丁文本。"

#. type: Plain text
#: en/diff-options.txt:31
#, fuzzy, priority:280
#| msgid "Generating patch text with -p"
msgid "\"Generating patch text with -p\")."
msgstr "使用选项 `-p` 生成补丁文本"

#. type: Plain text
#: en/diff-options.txt:34 en/diff-options.txt:139
#, fuzzy, no-wrap, priority:280
msgid "\tThis is the default.\n"
msgstr "\t这是默认设置。\n"

#. type: Labeled list
#: en/diff-options.txt:36 en/git-am.txt:38 en/git-blame.txt:75 en/git-cat-file.txt:46 en/git-cherry-pick.txt:105 en/git-clone.txt:76 en/git-diff-tree.txt:77 en/git-format-patch.txt:138 en/git-ls-files.txt:68 en/git-revert.txt:100 en/git-shortlog.txt:34 en/git-show-ref.txt:53 en/git-status.txt:27 en/git-stripspace.txt:38 en/git-svn.txt:46 en/git-tag.txt:64 en/git-verify-pack.txt:31 en/signoff-option.txt:2
#, ignore-same, no-wrap, priority:300
msgid "-s"
msgstr "-s"

#. type: Labeled list
#: en/diff-options.txt:37
#, ignore-same, no-wrap, priority:280
msgid "--no-patch"
msgstr "--no-patch"

#. type: Plain text
#: en/diff-options.txt:42
#, fuzzy, priority:280
msgid "Suppress all output from the diff machinery.  Useful for commands like `git show` that show the patch by default to squelch their output, or to cancel the effect of options like `--patch`, `--stat` earlier on the command line in an alias."
msgstr "不输出差异（diff）。对于显示修补程序的 `git show` 等命令是默认选项，也用于取消选项 `--patch` 的效果。"

#. type: Labeled list
#: en/diff-options.txt:46
#, fuzzy, no-wrap, priority:280
#| msgid "--diff-merges=(off|none|first-parent|1|separate|m|combined|c|dense-combined|cc)"
msgid "--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc|remerge|r)"
msgstr "--diff-merges=(off|none|first-parent|1|separate|m|combined|c|dense-combined|cc)"

#. type: Labeled list
#: en/diff-options.txt:47 en/diff-options.txt:53
#, ignore-same, no-wrap, priority:280
msgid "--no-diff-merges"
msgstr "--no-diff-merges"

#. type: Plain text
#: en/diff-options.txt:51
#, priority:280
msgid "Specify diff format to be used for merge commits. Default is {diff-merges-default} unless `--first-parent` is in use, in which case `first-parent` is the default."
msgstr "指定合并提交时使用的差异格式。默认为 {diff-merges-default}，但当使用 `--first-parent` 选项时，默认为 `first-parent`。"

#. type: Labeled list
#: en/diff-options.txt:52
#, fuzzy, no-wrap, priority:280
#| msgid "diffmerge"
msgid "--diff-merges=(off|none)"
msgstr "diffmerge"

#. type: Plain text
#: en/diff-options.txt:56
#, priority:280
msgid "Disable output of diffs for merge commits. Useful to override implied value."
msgstr "禁用合并提交时的差异输出。对覆盖隐含值很有用。"

#. type: Labeled list
#: en/diff-options.txt:57
#, fuzzy, no-wrap, priority:280
#| msgid "diffmerge"
msgid "--diff-merges=on"
msgstr "diffmerge"

#. type: Labeled list
#: en/diff-options.txt:58
#, fuzzy, no-wrap, priority:280
#| msgid "diffmerge"
msgid "--diff-merges=m"
msgstr "diffmerge"

#. type: Labeled list
#: en/diff-options.txt:59 en/git-am.txt:77 en/git-branch.txt:131 en/git-checkout.txt:246 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 en/git-help.txt:96 en/git-instaweb.txt:36 en/git-ls-files.txt:48 en/git-mailinfo.txt:71 en/git-read-tree.txt:33 en/git-rebase.txt:363 en/git-repack.txt:216 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:58
#, ignore-same, no-wrap, priority:280
msgid "-m"
msgstr "-m"

#. type: Plain text
#: en/diff-options.txt:65
#, fuzzy, priority:280
#| msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
msgid "This option makes diff output for merge commits to be shown in the default format. `-m` will produce the output only if `-p` is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value is `separate`."
msgstr "该选项使合并提交的差异输出以默认格式显示。`-m`只有在`-p`的情况下才会产生输出。默认格式可以通过`log.diffMerges`配置参数改变，默认值为`separate`。"

#. type: Labeled list
#: en/diff-options.txt:66
#, fuzzy, no-wrap, priority:280
#| msgid "--first-parent"
msgid "--diff-merges=first-parent"
msgstr "--first-parent"

#. type: Labeled list
#: en/diff-options.txt:67
#, fuzzy, no-wrap, priority:280
#| msgid "diffmerge"
msgid "--diff-merges=1"
msgstr "diffmerge"

#. type: Plain text
#: en/diff-options.txt:70
#, priority:280
msgid "This option makes merge commits show the full diff with respect to the first parent only."
msgstr "此选项使合并提交只显示与第一个父提交之间的完整差异。"

#. type: Labeled list
#: en/diff-options.txt:71
#, fuzzy, no-wrap, priority:280
#| msgid "diffmerge"
msgid "--diff-merges=separate"
msgstr "diffmerge"

#. type: Plain text
#: en/diff-options.txt:75
#, fuzzy, priority:280
#| msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. `-m` doesn't produce any output without `-p`."
msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent."
msgstr "这使得合并提交显示了每个父提交之间的完整差异。每个父提交都会产生单独的日志项和差异。`-m` 选项在没有 `-p` 选项时不会产生任何输出。"

#. type: Labeled list
#: en/diff-options.txt:76
#, fuzzy, no-wrap, priority:280
#| msgid "diffmerge"
msgid "--diff-merges=remerge"
msgstr "diffmerge"

#. type: Labeled list
#: en/diff-options.txt:77
#, fuzzy, no-wrap, priority:280
#| msgid "diffmerge"
msgid "--diff-merges=r"
msgstr "diffmerge"

#. type: Labeled list
#: en/diff-options.txt:78
#, ignore-same, no-wrap, priority:280
msgid "--remerge-diff"
msgstr "--remerge-diff"

#. type: Plain text
#: en/diff-options.txt:83
#, priority:280
msgid "With this option, two-parent merge commits are remerged to create a temporary tree object -- potentially containing files with conflict markers and such.  A diff is then shown between that temporary tree and the actual merge commit."
msgstr "With this option, two-parent merge commits are remerged to create a temporary tree object -- potentially containing files with conflict markers and such.  A diff is then shown between that temporary tree and the actual merge commit."

#. type: Plain text
#: en/diff-options.txt:87
#, priority:280
msgid "The output emitted when this option is used is subject to change, and so is its interaction with other options (unless explicitly documented)."
msgstr "使用该选项时发出的输出是可以改变的，它与其他选项的互动也是可以改变的（除非有明确的记录）。"

#. type: Labeled list
#: en/diff-options.txt:88
#, fuzzy, no-wrap, priority:280
#| msgid "diffmerge"
msgid "--diff-merges=combined"
msgstr "diffmerge"

#. type: Labeled list
#: en/diff-options.txt:89
#, fuzzy, no-wrap, priority:280
#| msgid "diffmerge"
msgid "--diff-merges=c"
msgstr "diffmerge"

#. type: Labeled list
#: en/diff-options.txt:90 en/git-am.txt:57 en/git-blame.txt:53 en/git-branch.txt:138 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:93 en/git-grep.txt:188 en/git-help.txt:65 en/git-ls-files.txt:38 en/git-shortlog.txt:87 en/git-stripspace.txt:42
#, ignore-same, no-wrap, priority:280
msgid "-c"
msgstr "-c"

#. type: Plain text
#: en/diff-options.txt:97
#, priority:280
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents. `-c` implies `-p`."
msgstr "使用此选项，合并提交的差异输出将同时显示每个父提交与合并结果的差异，而不是一次显示一个父提交与结果之间的成对差异 。此外，它只列出所有父提交中修改的文件。`-c` 选项暗含 `-p` 选项。"

#. type: Labeled list
#: en/diff-options.txt:98
#, fuzzy, no-wrap, priority:280
#| msgid "diffmerge"
msgid "--diff-merges=dense-combined"
msgstr "diffmerge"

#. type: Labeled list
#: en/diff-options.txt:99
#, fuzzy, no-wrap, priority:280
#| msgid "diffmerge"
msgid "--diff-merges=cc"
msgstr "diffmerge"

#. type: Labeled list
#: en/diff-options.txt:100 en/git-diff-files.txt:38 en/git-diff-tree.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--cc"
msgstr "--cc"

#. type: Plain text
#: en/diff-options.txt:106
#, fuzzy, priority:280
msgid "With this option the output produced by `--diff-merges=combined` is further compressed by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification.  `--cc` implies `-p`."
msgstr "使用该选项，通过省略不感兴趣的块，进一步压缩 `--diff-merges=combined` 产生的输出，这类块在父提交中的内容只有两个变体，并且合并结果选择了其中一个而没有修改。 `--cc` 选项暗含 `-p`。"

#. type: Labeled list
#: en/diff-options.txt:107 en/git-diff-tree.txt:113
#, ignore-same, no-wrap, priority:280
msgid "--combined-all-paths"
msgstr "--combined-all-paths"

#. type: Plain text
#: en/diff-options.txt:113
#, fuzzy, priority:280
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents.  It thus only has effect when `--diff-merges=[dense-]combined` is in use, and is likely only useful if filename changes are detected (i.e.  when either rename or copy detection have been requested)."
msgstr "这个标志会使合并后的差异文件（用于合并提交）列出所有父提交的名称。，因此它只在使用 `--diff-merges=[dense-]combined` 时有效。其可能在检测到文件名变化时有用（例如，当要求检测重命名或复制时）。"

#. type: Labeled list
#: en/diff-options.txt:115
#, fuzzy, no-wrap, priority:280
msgid "-U<n>"
msgstr "-U<n>"

#. type: Labeled list
#: en/diff-options.txt:116
#, fuzzy, no-wrap, priority:280
msgid "--unified=<n>"
msgstr "--unified=<n>"

#. type: Plain text
#: en/diff-options.txt:119
#, fuzzy, priority:280
msgid "Generate diffs with <n> lines of context instead of the usual three."
msgstr "生成带有 <n> 行上下文的差异，而不是通常的 3 行。暗含 `--patch` 选项。"

#. type: Plain text
#: en/diff-options.txt:121 en/diff-options.txt:529
#, fuzzy, no-wrap, priority:280
msgid "\tImplies `--patch`.\n"
msgstr "\t暗含 `-p`。\n"

#. type: Labeled list
#: en/diff-options.txt:123 en/git-archive.txt:59
#, fuzzy, no-wrap, priority:280
msgid "--output=<file>"
msgstr "--output=<文件>"

#. type: Plain text
#: en/diff-options.txt:125
#, fuzzy, priority:280
msgid "Output to a specific file instead of stdout."
msgstr "输出到一个特定的文件，而不是标准输出。"

#. type: Labeled list
#: en/diff-options.txt:126
#, fuzzy, no-wrap, priority:280
msgid "--output-indicator-new=<char>"
msgstr "--output-indicator-new=<字符>"

#. type: Labeled list
#: en/diff-options.txt:127
#, fuzzy, no-wrap, priority:280
msgid "--output-indicator-old=<char>"
msgstr "--output-indicator-old=<字符>"

#. type: Labeled list
#: en/diff-options.txt:128
#, fuzzy, no-wrap, priority:280
msgid "--output-indicator-context=<char>"
msgstr "--output-indicator-context=<字符>"

#. type: Plain text
#: en/diff-options.txt:132
#, fuzzy, priority:280
msgid "Specify the character used to indicate new, old or context lines in the generated patch. Normally they are '+', '-' and ' ' respectively."
msgstr "指定在生成的补丁中用来表示新、旧或上下文行的字符。通常它们分别是 '+'、'-' 和 ' '（空格）。"

#. type: Labeled list
#: en/diff-options.txt:134 en/git-replace.txt:78 en/git-verify-commit.txt:19 en/git-verify-tag.txt:19
#, ignore-same, no-wrap, priority:280
msgid "--raw"
msgstr "--raw"

#. type: Plain text
#: en/diff-options.txt:137
#, fuzzy, no-wrap, priority:280
msgid "\tGenerate the diff in raw format.\n"
msgstr "\t生成原始格式的差异。\n"

#. type: Plain text
#: en/diff-options.txt:147
#, fuzzy, no-wrap, priority:280
msgid ""
"\tFor each commit, show a summary of changes using the raw diff\n"
"\tformat. See the \"RAW OUTPUT FORMAT\" section of\n"
"\tlinkgit:git-diff[1]. This is different from showing the log\n"
"\titself in raw format, which you can achieve with\n"
"\t`--format=raw`.\n"
msgstr ""
"\t对于每一个提交，使用原始的差异格式\n"
"\t请参见 linkgit:git-diff[1] 中\n"
"\t\"原始输出格式\" 一节 。\n"
"\t这与显示日志中的本身的原始格式不同\n"
"\t你可以用 `--format=raw` 来实现。\n"

#. type: Labeled list
#: en/diff-options.txt:151
#, ignore-same, no-wrap, priority:280
msgid "--patch-with-raw"
msgstr "--patch-with-raw"

#. type: Plain text
#: en/diff-options.txt:153
#, fuzzy, priority:280
msgid "Synonym for `-p --raw`."
msgstr "`-p-raw` 的同义词。"

#. type: Plain text
#: en/diff-options.txt:158
#, fuzzy, priority:280
msgid "Show the tree objects in the diff output."
msgstr "在差异输出中显示树对象。"

#. type: Labeled list
#: en/diff-options.txt:160
#, ignore-same, no-wrap, priority:280
msgid "--indent-heuristic"
msgstr "--indent-heuristic"

#. type: Plain text
#: en/diff-options.txt:163
#, fuzzy, priority:280
msgid "Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default."
msgstr "启用启发式的缩进区块的方法，使得补丁更易读。这是默认选项。"

#. type: Labeled list
#: en/diff-options.txt:164
#, ignore-same, no-wrap, priority:280
msgid "--no-indent-heuristic"
msgstr "--no-indent-heuristic"

#. type: Plain text
#: en/diff-options.txt:166
#, fuzzy, priority:280
msgid "Disable the indent heuristic."
msgstr "禁用启发式缩进。"

#. type: Labeled list
#: en/diff-options.txt:167
#, ignore-same, no-wrap, priority:280
msgid "--minimal"
msgstr "--minimal"

#. type: Plain text
#: en/diff-options.txt:170 en/diff-options.txt:196
#, fuzzy, priority:280
msgid "Spend extra time to make sure the smallest possible diff is produced."
msgstr "花费额外的时间以确保生成尽可能小的差异。"

#. type: Labeled list
#: en/diff-options.txt:171
#, ignore-same, no-wrap, priority:280
msgid "--patience"
msgstr "--patience"

#. type: Plain text
#: en/diff-options.txt:173
#, fuzzy, priority:280
msgid "Generate a diff using the \"patience diff\" algorithm."
msgstr "使用 \"patience diff\" 算法生成差异。"

#. type: Labeled list
#: en/diff-options.txt:174
#, ignore-same, no-wrap, priority:280
msgid "--histogram"
msgstr "--histogram"

#. type: Plain text
#: en/diff-options.txt:176
#, fuzzy, priority:280
msgid "Generate a diff using the \"histogram diff\" algorithm."
msgstr "使用 \"histogram diff\" 算法生成差异。"

#. type: Labeled list
#: en/diff-options.txt:177
#, fuzzy, no-wrap, priority:280
msgid "--anchored=<text>"
msgstr "--anchored=<文本>"

#. type: Plain text
#: en/diff-options.txt:179
#, fuzzy, priority:280
msgid "Generate a diff using the \"anchored diff\" algorithm."
msgstr "使用 \"anchored diff\" 算法生成差异。"

#. type: Plain text
#: en/diff-options.txt:181
#, fuzzy, priority:280
msgid "This option may be specified more than once."
msgstr "这个选项可以被指定多次。"

#. type: Plain text
#: en/diff-options.txt:186
#, fuzzy, priority:280
msgid "If a line exists in both the source and destination, exists only once, and starts with this text, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the \"patience diff\" algorithm internally."
msgstr "如果某一个行同时存在于来源和目标中，各只出现一次，以这个文本开头，这个算法试图防止它在输出中以删除或添加的形式出现。它在内部使用了 \"patience diff\" 算法。"

#. type: Labeled list
#: en/diff-options.txt:187
#, fuzzy, no-wrap, priority:280
msgid "--diff-algorithm={patience|minimal|histogram|myers}"
msgstr "diff-algorithm=[patience|minimal|histogram|myers]"

#. type: Plain text
#: en/diff-options.txt:189
#, fuzzy, priority:280
msgid "Choose a diff algorithm. The variants are as follows:"
msgstr "选择差异算法。有如下可选项："

#. type: Labeled list
#: en/diff-options.txt:191
#, ignore-same, no-wrap, priority:280
msgid "`default`, `myers`"
msgstr "`default`, `myers`"

#. type: Plain text
#: en/diff-options.txt:193
#, fuzzy, priority:280
msgid "The basic greedy diff algorithm. Currently, this is the default."
msgstr "基本的贪婪差异算法。当前是默认设置。"

#. type: Labeled list
#: en/diff-options.txt:193
#, ignore-same, no-wrap, priority:280
msgid "`minimal`"
msgstr "`minimal`"

#. type: Labeled list
#: en/diff-options.txt:196
#, ignore-same, no-wrap, priority:280
msgid "`patience`"
msgstr "`patience`"

#. type: Plain text
#: en/diff-options.txt:198
#, fuzzy, priority:280
msgid "Use \"patience diff\" algorithm when generating patches."
msgstr "使用 \"patience diff\" 算法时产生的补丁。"

#. type: Labeled list
#: en/diff-options.txt:198
#, ignore-same, no-wrap, priority:280
msgid "`histogram`"
msgstr "`histogram`"

#. type: Plain text
#: en/diff-options.txt:201
#, fuzzy, priority:280
msgid "This algorithm extends the patience algorithm to \"support low-occurrence common elements\"."
msgstr "该算法将耐心算法扩展为“支持低发生率的常见元素”。"

#. type: Plain text
#: en/diff-options.txt:206
#, fuzzy, priority:280
msgid "For instance, if you configured the `diff.algorithm` variable to a non-default value and want to use the default one, then you have to use `--diff-algorithm=default` option."
msgstr "例如，如果你将 `diff.algorithm` 变量配置为非默认值，但希望使用默认值，那么你必须使用 `--diff-algorithm=default` 选项。"

#. type: Labeled list
#: en/diff-options.txt:207
#, no-wrap, priority:280
msgid "--stat[=<width>[,<name-width>[,<count>]]]"
msgstr "--stat[=<宽度>[,<名称宽度>[,<数值>]]]"

#. type: Plain text
#: en/diff-options.txt:221
#, fuzzy, ignore-ellipsis, priority:280
msgid "Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by `<width>`. The width of the filename part can be limited by giving another width `<name-width>` after a comma. The width of the graph part can be limited by using `--stat-graph-width=<width>` (affects all commands generating a stat graph) or by setting `diff.statGraphWidth=<width>` (does not affect `git format-patch`).  By giving a third parameter `<count>`, you can limit the output to the first `<count>` lines, followed by `...` if there are more."
msgstr "生成一个差异状态。默认情况下，文件名部分将尽可能多地使用空间，其余的空间用于图形部分。最大宽度默认为终端宽度，如果没有连接到终端，最大宽度为80列。可以用 `<宽度>` 覆盖。文件名部分的宽度可以通过在逗号后加一个参数 `<名称宽度>` 来限制。图形部分的宽度可以通过使用 `--stat-graph-width=<宽度>` 来限制（影响所有生成状态图的命令），或者通过设置 `diff.statGraphWidth=<宽度>`（不影响 `git format-patch`）。通过给第三个参数 `<数量>`，你可以把输出限制在第一个`<count>` 行。如果有更多的行，后面是 `...`。"

#. type: Plain text
#: en/diff-options.txt:224
#, fuzzy, priority:280
msgid "These parameters can also be set individually with `--stat-width=<width>`, `--stat-name-width=<name-width>` and `--stat-count=<count>`."
msgstr "这些参数也可以用 `--stat-width=<宽度>`，`--stat-name-width=<名称宽度>` 和 `--stat-count=<数量>` 单独设置。"

#. type: Labeled list
#: en/diff-options.txt:225
#, ignore-same, no-wrap, priority:280
msgid "--compact-summary"
msgstr "--compact-summary"

#. type: Plain text
#: en/diff-options.txt:232
#, fuzzy, priority:280
msgid "Output a condensed summary of extended header information such as file creations or deletions (\"new\" or \"gone\", optionally \"+l\" if it's a symlink) and mode changes (\"+x\" or \"-x\" for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies `--stat`."
msgstr "在差异状态中输出扩展头信息的压缩摘要，如文件的创建或删除（\"new \" 或 \"good\"。如果是符号链接，则为 \"+l\"）和模式变化（\"+x\" 或 \"-x\" 分别用于添加或删除可执行位）。这些信息被放在文件名部分和图形部分之间。暗含 `--stat` 选项。"

#. type: Labeled list
#: en/diff-options.txt:233 en/git-apply.txt:45
#, ignore-same, no-wrap, priority:280
msgid "--numstat"
msgstr "--numstat"

#. type: Plain text
#: en/diff-options.txt:239
#, fuzzy, priority:280
msgid "Similar to `--stat`, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly.  For binary files, outputs two `-` instead of saying `0 0`."
msgstr "类似于 `--stat`，但是使用小数点和不含缩写的路径名显示添加和删除的行数，使其对程序更友好。对于二进制文件，输出两个 `-`，而不是 `0 0`。"

#. type: Labeled list
#: en/diff-options.txt:240
#, ignore-same, no-wrap, priority:280
msgid "--shortstat"
msgstr "--shortstat"

#. type: Plain text
#: en/diff-options.txt:244
#, fuzzy, priority:280
msgid "Output only the last line of the `--stat` format containing total number of modified files, as well as number of added and deleted lines."
msgstr "只输出使用 `--stat` 选项输出的最后一行，包含修改的文件总数，添加和删除的行数。"

#. type: Labeled list
#: en/diff-options.txt:245
#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "-X[<param1,param2,...>]"
msgstr "-X[<参数1,参数2,...>]"

#. type: Labeled list
#: en/diff-options.txt:246
#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "--dirstat[=<param1,param2,...>]"
msgstr "--dirstat[=<参数1,参数2,...>]"

#. type: Plain text
#: en/diff-options.txt:253
#, fuzzy, priority:280
msgid "Output the distribution of relative amount of changes for each sub-directory. The behavior of `--dirstat` can be customized by passing it a comma separated list of parameters.  The defaults are controlled by the `diff.dirstat` configuration variable (see linkgit:git-config[1]).  The following parameters are available:"
msgstr "输出每个子目录的相对变化量的分布。`--dirstat` 的行为可以通过传递一个以逗号分隔的参数列表来自定义。默认值由`diff.dirstat` 配置变量控制 (参见 linkgit:git-config[1])。以下是可用的参数："

#. type: Labeled list
#: en/diff-options.txt:255
#, ignore-same, no-wrap, priority:280
msgid "`changes`"
msgstr "`changes`"

#. type: Plain text
#: en/diff-options.txt:261
#, fuzzy, priority:280
msgid "Compute the dirstat numbers by counting the lines that have been removed from the source, or added to the destination. This ignores the amount of pure code movements within a file.  In other words, rearranging lines in a file is not counted as much as other changes.  This is the default behavior when no parameter is given."
msgstr "通过计算从源文件中删除的行数或添加到目标文件中的行数来计算分布状态的数字。这忽略了文件内的代码移动行为。也就是说，在文件中重新排列的行不会像其他变化一样被计算在内。这是在没有给出参数时的默认行为。"

#. type: Labeled list
#: en/diff-options.txt:261
#, ignore-same, no-wrap, priority:280
msgid "`lines`"
msgstr "`lines`"

#. type: Plain text
#: en/diff-options.txt:269
#, fuzzy, priority:280
msgid "Compute the dirstat numbers by doing the regular line-based diff analysis, and summing the removed/added line counts. (For binary files, count 64-byte chunks instead, since binary files have no natural concept of lines). This is a more expensive `--dirstat` behavior than the `changes` behavior, but it does count rearranged lines within a file as much as other changes. The resulting output is consistent with what you get from the other `--*stat` options."
msgstr "通过做常规基于行的差异分析，计算分布状态的数字，并将删除/添加的行数相加。(对于二进制文件，用64字节的块来计算，因为二进制文件没有行的概念)。在使用 `--dirstat` 时这个选项的行为开销比 `changes` 更大，但会对文件中重新排列的行进行计数。其得到的输出结果与其他的 `--*stat` 选项一致。"

#. type: Labeled list
#: en/diff-options.txt:269
#, ignore-same, no-wrap, priority:280
msgid "`files`"
msgstr "`files`"

#. type: Plain text
#: en/diff-options.txt:274
#, fuzzy, priority:280
msgid "Compute the dirstat numbers by counting the number of files changed.  Each changed file counts equally in the dirstat analysis. This is the computationally cheapest `--dirstat` behavior, since it does not have to look at the file contents at all."
msgstr "通过计算被改变的文件数量来计算分布状态的数字。在分布状态分析中，每一个被改变的文件都会被平等地计算。这是计算上开销最小的 `--dirstat` 行为，因为它无需查看文件内容。"

#. type: Labeled list
#: en/diff-options.txt:274
#, ignore-same, no-wrap, priority:280
msgid "`cumulative`"
msgstr "`cumulative`"

#. type: Plain text
#: en/diff-options.txt:279
#, fuzzy, priority:280
msgid "Count changes in a child directory for the parent directory as well.  Note that when using `cumulative`, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the `noncumulative` parameter."
msgstr "子目录中的变化计算到父目录中。 注意，当使用 `cumulative` 选项时，报告的百分比之和可能超过100%。默认的（非累积）行为可以用 `noncumulative` 参数指定。"

#. type: Labeled list
#: en/diff-options.txt:279 en/git-cherry.txt:39
#, no-wrap, priority:280
msgid "<limit>"
msgstr "<limit>"

#. type: Plain text
#: en/diff-options.txt:283
#, fuzzy, priority:280
msgid "An integer parameter specifies a cut-off percent (3% by default).  Directories contributing less than this percentage of the changes are not shown in the output."
msgstr "一个整数参数，其指定一个截止百分比（默认为3%）。贡献值小于这个百分比的目录不显示在输出中。"

#. type: Plain text
#: en/diff-options.txt:289
#, fuzzy, priority:280
msgid "Example: The following will count changed files, while ignoring directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories: `--dirstat=files,10,cumulative`."
msgstr "例如：下面的参数会统计更改的文件，同时忽略占更改文件总数10%以下的目录，并累积父目录中的子目录计数：`--dirstat=files,10,cumulative`。"

#. type: Labeled list
#: en/diff-options.txt:290
#, ignore-same, no-wrap, priority:280
msgid "--cumulative"
msgstr "--cumulative"

#. type: Plain text
#: en/diff-options.txt:292
#, priority:280
msgid "Synonym for --dirstat=cumulative"
msgstr "--dirstat=cumulative 同义"

#. type: Labeled list
#: en/diff-options.txt:293
#, fuzzy, ignore-ellipsis, no-wrap, priority:280
msgid "--dirstat-by-file[=<param1,param2>...]"
msgstr "--dirstat-byfile[=<参数1,参数2>...]"

#. type: Plain text
#: en/diff-options.txt:295
#, fuzzy, ignore-ellipsis, priority:280
msgid "Synonym for --dirstat=files,param1,param2..."
msgstr "--dirstat=files,param1,param2... 的同义词。"

#. type: Labeled list
#: en/diff-options.txt:296 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:168
#, ignore-same, no-wrap, priority:280
msgid "--summary"
msgstr "--summary"

#. type: Plain text
#: en/diff-options.txt:299
#, fuzzy, priority:280
msgid "Output a condensed summary of extended header information such as creations, renames and mode changes."
msgstr "输出扩展头信息，如创建、重命名和模式变化等，的压缩摘要。"

#. type: Labeled list
#: en/diff-options.txt:301
#, ignore-same, no-wrap, priority:280
msgid "--patch-with-stat"
msgstr "--patch-with-stat"

#. type: Plain text
#: en/diff-options.txt:303
#, priority:280
msgid "Synonym for `-p --stat`."
msgstr "同义词 '-p --stat'。"

#. type: Labeled list
#: en/diff-options.txt:307 en/git-apply.txt:116 en/git-cat-file.txt:251 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:73 en/git-commit.txt:158 en/git-config.txt:229 en/git-grep.txt:176 en/git-ls-files.txt:99 en/git-ls-tree.txt:55 en/git-merge-tree.txt:43 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:173 en/git-worktree.txt:245
#, ignore-same, no-wrap, priority:280
msgid "-z"
msgstr "-z"

#. type: Plain text
#: en/diff-options.txt:310
#, fuzzy, no-wrap, priority:280
msgid "\tSeparate the commits with NULs instead of with new newlines.\n"
msgstr "\t用 NUL 而不是用换行来分隔提交。\n"

#. type: Plain text
#: en/diff-options.txt:313
#, fuzzy, priority:280
msgid "Also, when `--raw` or `--numstat` has been given, do not munge pathnames and use NULs as output field terminators."
msgstr "另外，当给出 `--raw` 或 `--numstat` 时，不合并路径名，并使用 NUL 作为输出字段终止符。"

#. type: Plain text
#: en/diff-options.txt:317
#, fuzzy, no-wrap, priority:280
msgid ""
"\tWhen `--raw`, `--numstat`, `--name-only` or `--name-status` has been\n"
"\tgiven, do not munge pathnames and use NULs as output field terminators.\n"
msgstr ""
"\t另外，当给出 `--raw` 或 `--numstat` 时，\n"
"\t不合并路径名，并使用 NUL 作为输出字段终止符。\n"

#. type: Plain text
#: en/diff-options.txt:322 en/git-apply.txt:123
#, fuzzy, priority:280
msgid "Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr "如果没有这个选项，带 \"不常见\" 字符的路径名会被引用，正如配置变量 `core.quotePath` 所解释的那样（参见 linkgit:git-config[1]）。"

#. type: Labeled list
#: en/diff-options.txt:323 en/git-config.txt:238 en/git-grep.txt:158 en/git-ls-tree.txt:59 en/git-merge-tree.txt:49 en/git-name-rev.txt:74
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
msgstr "--name-only"

#. type: Plain text
#: en/diff-options.txt:327
#, priority:280
msgid "Show only names of changed files. The file names are often encoded in UTF-8.  For more information see the discussion about encoding in the linkgit:git-log[1] manual page."
msgstr "只显示更改过的文件的名称。文件名通常以 UTF-8 编码。  更多信息见 linkgit:git-log[1] 手册页中关于编码的讨论。"

#. type: Labeled list
#: en/diff-options.txt:328 en/git-ls-tree.txt:60
#, ignore-same, no-wrap, priority:280
msgid "--name-status"
msgstr "--name-status"

#. type: Plain text
#: en/diff-options.txt:332
#, fuzzy, priority:280
msgid "Show only names and status of changed files. See the description of the `--diff-filter` option on what the status letters mean.  Just like `--name-only` the file names are often encoded in UTF-8."
msgstr "仅显示已更改文件的名称和状态。有关状态字母的含义，请参阅 `--diff-filter` 选项的说明。"

#. type: Labeled list
#: en/diff-options.txt:333
#, fuzzy, no-wrap, priority:280
msgid "--submodule[=<format>]"
msgstr "--submodule[=<格式>]"

#. type: Plain text
#: en/diff-options.txt:344
#, fuzzy, priority:280
msgid "Specify how differences in submodules are shown.  When specifying `--submodule=short` the 'short' format is used.  This format just shows the names of the commits at the beginning and end of the range.  When `--submodule` or `--submodule=log` is specified, the 'log' format is used.  This format lists the commits in the range like linkgit:git-submodule[1] `summary` does.  When `--submodule=diff` is specified, the 'diff' format is used.  This format shows an inline diff of the changes in the submodule contents between the commit range.  Defaults to `diff.submodule` or the 'short' format if the config option is unset."
msgstr "指定子模块中的差异如何显示。当指定 `--submodule=short` 选项时，会使用 'short' 格式。这种格式只显示范围的开头和结尾处的提交名称。当指定了 `--submodule=short` 或  `--submodule=log` 时，会使用 'log' 格式。这种格式会像 linkgit:git-submodule[1]  `summary` 那样，列出该范围内的提交。当指定了 `--submodule=diff` 时，会使用 'diff' 格式。这个格式显示的是子模块内在提交范围之间的变化差异。默认为 `diff.submodule`，如果配置选项未设置， 则为 `short` 格式。"

#. type: Labeled list
#: en/diff-options.txt:345 en/git-branch.txt:145 en/git-for-each-ref.txt:66 en/git-grep.txt:193 en/git-show-branch.txt:118 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr "--color[=<when>]"

#. type: Plain text
#: en/diff-options.txt:349
#, fuzzy, priority:280
msgid "Show colored diff.  `--color` (i.e. without '=<when>') is the same as `--color=always`.  '<when>' can be one of `always`, `never`, or `auto`."
msgstr "显示有颜色的差异。`--color`（即不含 '=<何时>'）与 `--color=always` 相同。'<何时>' 可以是 `always`、`never` 或 `auto`。"

#. type: Plain text
#: en/diff-options.txt:352
#, fuzzy, no-wrap, priority:280
msgid ""
"\tIt can be changed by the `color.ui` and `color.diff`\n"
"\tconfiguration settings.\n"
msgstr ""
"\t它可以通过 `color.ui` 和 `color.diff` 来改变\n"
"\t配置设置。\n"

#. type: Labeled list
#: en/diff-options.txt:354 en/git-branch.txt:150 en/git-grep.txt:197 en/git-show-branch.txt:123
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
msgstr "--no-color"

#. type: Plain text
#: en/diff-options.txt:356
#, fuzzy, priority:280
msgid "Turn off colored diff."
msgstr "关掉带彩色显示的差异。"

#. type: Plain text
#: en/diff-options.txt:358
#, fuzzy, no-wrap, priority:280
msgid "\tThis can be used to override configuration settings.\n"
msgstr "\t这可以用来覆盖配置设置。\n"

#. type: Plain text
#: en/diff-options.txt:360
#, fuzzy, no-wrap, priority:280
msgid "\tIt is the same as `--color=never`.\n"
msgstr "\t这和 `--color=never` 相同。\n"

#. type: Labeled list
#: en/diff-options.txt:361
#, no-wrap, priority:280
msgid "--color-moved[=<mode>]"
msgstr "--color-moved[=<模式>]"

#. type: Plain text
#: en/diff-options.txt:363
#, fuzzy, priority:280
msgid "Moved lines of code are colored differently."
msgstr "移动的代码行的颜色不同。"

#. type: Plain text
#: en/diff-options.txt:365
#, fuzzy, no-wrap, priority:280
msgid "\tIt can be changed by the `diff.colorMoved` configuration setting.\n"
msgstr "\t它可以通过 `diff.colorMoved` 配置设置来改变。\n"

#. type: Plain text
#: en/diff-options.txt:369
#, fuzzy, no-wrap, priority:280
msgid ""
"\tThe <mode> defaults to 'no' if the option is not given\n"
"\tand to 'zebra' if the option with no mode is given.\n"
"\tThe mode must be one of:\n"
msgstr ""
"\t如果没有给出该选项，<模式> 默认为 'no'\n"
"\t如果没有给定模式选项，则为 'zebra'。\n"
"\t该模式必须以下其中之一：\n"

#. type: Labeled list
#: en/diff-options.txt:371 en/diff-options.txt:413
#, ignore-same, no-wrap, priority:280
msgid "no"
msgstr "no"

#. type: Plain text
#: en/diff-options.txt:373
#, fuzzy, priority:280
msgid "Moved lines are not highlighted."
msgstr "被移动的行不突出显示。"

#. type: Labeled list
#: en/diff-options.txt:373 en/git-commit.txt:252
#, ignore-same, no-wrap, priority:280
msgid "default"
msgstr "default"

#. type: Plain text
#: en/diff-options.txt:376
#, fuzzy, priority:280
msgid "Is a synonym for `zebra`. This may change to a more sensible mode in the future."
msgstr "是 `zebra` 的同义词。今后可能会改成更合理的模式。"

#. type: Labeled list
#: en/diff-options.txt:376 en/diff-options.txt:445
#, ignore-same, no-wrap, priority:280
msgid "plain"
msgstr "plain"

#. type: Plain text
#: en/diff-options.txt:383
#, fuzzy, priority:280
msgid "Any line that is added in one location and was removed in another location will be colored with 'color.diff.newMoved'.  Similarly 'color.diff.oldMoved' will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation."
msgstr "任何在某个位置被添加，且在另一个位置被删除的行，都会被用 'color.diff.newMoved' 着色。同样的，在差异中在某处删除且在其它地方添加的行会使用 'color.diff.oldMoved' 着色。这种模式可以读取任何被移动的行，但在代码审查中，它不能确定一个代码块是否未经排列而进行了移动。"

#. type: Labeled list
#: en/diff-options.txt:383
#, ignore-same, no-wrap, priority:280
msgid "blocks"
msgstr "blocks"

#. type: Plain text
#: en/diff-options.txt:388
#, fuzzy, priority:280
msgid "Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are painted using either the 'color.diff.{old,new}Moved' color.  Adjacent blocks cannot be told apart."
msgstr "使用贪心方法检测含至少20个字母数字字符的移动文本块。检测到的区块使用 'color.diff.{old,new}Moved' 的颜色。相邻的区块不能被区分开。"

#. type: Labeled list
#: en/diff-options.txt:388
#, ignore-same, no-wrap, priority:280
msgid "zebra"
msgstr "zebra"

#. type: Plain text
#: en/diff-options.txt:393
#, fuzzy, priority:280
msgid "Blocks of moved text are detected as in 'blocks' mode. The blocks are painted using either the 'color.diff.{old,new}Moved' color or 'color.diff.{old,new}MovedAlternative'. The change between the two colors indicates that a new block was detected."
msgstr "在“块”模式下检测到移动的文本块。块使用 'color.diff.{old,new}Moved' 颜色或 'color.diff.{old,new}MovedAlternative' 颜色。这两种颜色之间的变化表示检测到了新的块。"

#. type: Labeled list
#: en/diff-options.txt:393
#, ignore-same, no-wrap, priority:280
msgid "dimmed-zebra"
msgstr "dimmed-zebra"

#. type: Plain text
#: en/diff-options.txt:398
#, fuzzy, priority:280
msgid "Similar to 'zebra', but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting.  `dimmed_zebra` is a deprecated synonym."
msgstr "类似于  'zebra' 模式，但对=使移动的代码中不关注的部分变暗。相邻两个区块的边界线被认为是重要，其余的部分是无关紧要的。`dimmed_zebra` 是一个被废弃的同义词。"

#. type: Labeled list
#: en/diff-options.txt:400
#, ignore-same, no-wrap, priority:280
msgid "--no-color-moved"
msgstr "--no-color-moved"

#. type: Plain text
#: en/diff-options.txt:403
#, fuzzy, priority:280
msgid "Turn off move detection. This can be used to override configuration settings. It is the same as `--color-moved=no`."
msgstr "关闭移动检测。这可以用来覆盖配置设置。它与 `--color-moved=no` 相同。"

#. type: Labeled list
#: en/diff-options.txt:404
#, no-wrap, priority:280
msgid "--color-moved-ws=<modes>"
msgstr "--color-moved-ws=<模式>"

#. type: Plain text
#: en/diff-options.txt:407
#, fuzzy, priority:280
msgid "This configures how whitespace is ignored when performing the move detection for `--color-moved`."
msgstr "这将配置在执行 `--color-moved` 的移动检测时如何忽略空格。"

#. type: Plain text
#: en/diff-options.txt:409
#, fuzzy, no-wrap, priority:280
msgid "\tIt can be set by the `diff.colorMovedWS` configuration setting.\n"
msgstr "\t可以通过 `diff.colorMovedWS` 来设置。\n"

#. type: Plain text
#: en/diff-options.txt:411
#, fuzzy, no-wrap, priority:280
msgid "\tThese modes can be given as a comma separated list:\n"
msgstr "\t这些模式可以通过以逗号分隔的列表给出：\n"

#. type: Plain text
#: en/diff-options.txt:415
#, fuzzy, priority:280
msgid "Do not ignore whitespace when performing move detection."
msgstr "执行移动检测时不忽略空格。"

#. type: Labeled list
#: en/diff-options.txt:415 en/merge-strategies.txt:43
#, ignore-same, no-wrap, priority:280
msgid "ignore-space-at-eol"
msgstr "ignore-space-at-eol"

#. type: Plain text
#: en/diff-options.txt:417 en/diff-options.txt:771
#, fuzzy, priority:280
msgid "Ignore changes in whitespace at EOL."
msgstr "忽略行尾空格的变化。"

#. type: Labeled list
#: en/diff-options.txt:417 en/merge-strategies.txt:41
#, ignore-same, no-wrap, priority:280
msgid "ignore-space-change"
msgstr "ignore-space-change"

#. type: Plain text
#: en/diff-options.txt:421 en/diff-options.txt:777
#, fuzzy, priority:280
msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
msgstr "忽略空格数量的变化。这会忽略行尾的空格，并认为包含一个或多个空格字符的其他序列都是等同的。"

#. type: Labeled list
#: en/diff-options.txt:421 en/merge-strategies.txt:42
#, ignore-same, no-wrap, priority:280
msgid "ignore-all-space"
msgstr "ignore-all-space"

#. type: Plain text
#: en/diff-options.txt:424
#, fuzzy, priority:280
msgid "Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none."
msgstr "比较行时忽略空格。即使一行有空格而另一行没有空格，也会忽略差异。"

#. type: Labeled list
#: en/diff-options.txt:424
#, ignore-same, no-wrap, priority:280
msgid "allow-indentation-change"
msgstr "allow-indentation-change"

#. type: Plain text
#: en/diff-options.txt:429
#, fuzzy, priority:280