documentation.zh_HANS-CN.po

msgid "T: change in the type of the file"
msgstr "T：文件类型改变"

#. type: Plain text
#: en/diff-format.txt:65
#, priority:280
msgid "U: file is unmerged (you must complete the merge before it can be committed)"
msgstr "U：文件未合并（你必须在提交之前完成合并）"

#. type: Plain text
#: en/diff-format.txt:66
#, priority:280
msgid "X: \"unknown\" change type (most probably a bug, please report it)"
msgstr "X：\"unknown\"（未知）更改类型（可能为错误，请报告）"

#. type: Plain text
#: en/diff-format.txt:71
#, priority:280
msgid "Status letters C and R are always followed by a score (denoting the percentage of similarity between the source and target of the move or copy).  Status letter M may be followed by a score (denoting the percentage of dissimilarity) for file rewrites."
msgstr "状态字母 C 和 R 后面总是一个分数（表示移动或复制的源与目标之间的相似性百分比）。状态字母M后面可能有文件重写的分数（表示相异百分比）。"

#. type: Plain text
#: en/diff-format.txt:74
#, priority:280
msgid "<sha1> is shown as all 0's if a file is new on the filesystem and it is out of sync with the index."
msgstr "如果文件是文件系统上的新文件，并且与索引不同步，则 <sha1> 将显示为全0。"

#. type: Labeled list
#: en/diff-format.txt:76 en/git-svn.txt:499 en/git-svn.txt:539
#, no-wrap, priority:280
msgid "Example:"
msgstr "例如："

#. type: delimited block -
#: en/diff-format.txt:79
#, no-wrap, priority:280
msgid ":100644 100644 5be4a4a 0000000 M file.c\n"
msgstr ":100644 100644 5be4a4a 0000000 M file.c\n"

#. type: Plain text
#: en/diff-format.txt:85 en/git-ls-files.txt:212 en/git-ls-tree.txt:101
#, fuzzy, priority:280
msgid "Without the `-z` option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]).  Using `-z` the filename is output verbatim and the line is terminated by a NUL byte."
msgstr ""
"如果没有 `-z` 选项，带 \"不常见\" 字符的路径名会被加上引号，正如配置变量 \"core.quotePath\" 所解释的那样（参见 "
"linkgit:git-config[1]）。  使用 `-z` 选项，文件名将被逐字输出，并以 NUL 字节结束。"

#. type: Title -
#: en/diff-format.txt:87
#, no-wrap, priority:280
msgid "diff format for merges"
msgstr "合并的差异格式"

#. type: Plain text
#: en/diff-format.txt:93
#, priority:280
msgid "\"git-diff-tree\", \"git-diff-files\" and \"git-diff --raw\" can take `-c` or `--cc` option to generate diff output also for merge commits.  The output differs from the format described above in the following way:"
msgstr ""
"\"git-diff-tree\"、\"git-diff-files\" 和 \"git-diff --raw\" 可以使用 `-c` 或 `--cc` "
"选项来生成差异输出，也可以用于合并提交。其输出与上面描述的格式有以下不同："

#. type: Plain text
#: en/diff-format.txt:95
#, priority:280
msgid "there is a colon for each parent"
msgstr "每个父提交都有一个冒号"

#. type: Plain text
#: en/diff-format.txt:96
#, fuzzy, priority:280
msgid "there are more \"src\" modes and \"src\" sha1"
msgstr "有更多的 \"src\" 文件模式和 \"src\" sha1"

#. type: Plain text
#: en/diff-format.txt:97
#, priority:280
msgid "status is concatenated status characters for each parent"
msgstr "状态是每个父提交的状态字符的合并"

#. type: Plain text
#: en/diff-format.txt:98
#, priority:280
msgid "no optional \"score\" number"
msgstr "无可选的分数（\"score\"）数字"

#. type: Plain text
#: en/diff-format.txt:99
#, priority:280
msgid "tab-separated pathname(s) of the file"
msgstr "以制表符分隔的文件路径名"

#. type: Plain text
#: en/diff-format.txt:104
#, fuzzy, priority:280
msgid "For `-c` and `--cc`, only the destination or final path is shown even if the file was renamed on any side of history.  With `--combined-all-paths`, the name of the path in each parent is shown followed by the name of the path in the merge commit."
msgstr ""
"对于 `-c` 和 `--cc` 选项，即使文件在历史中的任何一边被重命名，也只显示目标路径或最终路径。使用 `--combined-all-paths`"
" 选项，则每个父提交中的路径名称会在合并提交中的路径名称后面显示。"

#. type: Plain text
#: en/diff-format.txt:106
#, priority:280
msgid "Examples for `-c` and `--cc` without `--combined-all-paths`:"
msgstr "以下为带 `-c` 和 `--cc` 选项且不带 `--combined-all-paths` 选项的示例："

#. type: delimited block -
#: en/diff-format.txt:110
#, no-wrap, priority:280
msgid ""
"::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdesc.c\n"
"::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM\tbar.sh\n"
"::100644 100644 100644 e07d6c5 9042e82 ee91881 RR\tphooey.c\n"
msgstr ""
"::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdesc.c\n"
"::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM\tbar.sh\n"
"::100644 100644 100644 e07d6c5 9042e82 ee91881 RR\tphooey.c\n"

#. type: Plain text
#: en/diff-format.txt:113
#, priority:280
msgid "Examples when `--combined-all-paths` added to either `-c` or `--cc`:"
msgstr "以下为使用 `--combined-all-paths` 选项且使用 `-c` 或 `--cc` 选项的示例:"

#. type: delimited block -
#: en/diff-format.txt:118
#, no-wrap, priority:280
msgid ""
"::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdesc.c\tdesc.c\tdesc.c\n"
"::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM\tfoo.sh\tbar.sh\tbar.sh\n"
"::100644 100644 100644 e07d6c5 9042e82 ee91881 RR\tfooey.c\tfuey.c\tphooey.c\n"
msgstr ""
"::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdesc.c\tdesc.c\tdesc.c\n"
"::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM\tfoo.sh\tbar.sh\tbar.sh\n"
"::100644 100644 100644 e07d6c5 9042e82 ee91881 RR\tfooey.c\tfuey.c\tphooey."
"c\n"

#. type: Plain text
#: en/diff-format.txt:122
#, priority:280
msgid "Note that 'combined diff' lists only files which were modified from all parents."
msgstr "请注意 'combined diff' 只列出了从所有父提交中修改过的文件。"

#. type: Title -
#: en/diff-format.txt:128
#, no-wrap, priority:280
msgid "other diff formats"
msgstr "其他差异格式"

#. type: Plain text
#: en/diff-format.txt:134
#, priority:280
msgid "The `--summary` option describes newly added, deleted, renamed and copied files.  The `--stat` option adds diffstat(1) graph to the output.  These options can be combined with other options, such as `-p`, and are meant for human consumption."
msgstr ""
"`--summary` 选项描述新添加、删除、重命名和复制的文件。`--stat` 选项将 diffstat(1) "
"图添加到输出中。这些选项可以与其他选项组合在一起，如 `-p` 选项可以提高可读性。"

#. type: Plain text
#: en/diff-format.txt:139
#, priority:280
msgid "When showing a change that involves a rename or a copy, `--stat` output formats the pathnames compactly by combining common prefix and suffix of the pathnames.  For example, a change that moves `arch/i386/Makefile` to `arch/x86/Makefile` while modifying 4 lines will be shown like this:"
msgstr ""
"当显示一个涉及到重命名或复制的更改时，`--stat` 输出会将路径名的前缀和后缀结合在一起，会以较紧凑的方式显示。例如，将 \"arch/i386/"
"Makefile\" 移动到 \"arch/x86/Makefile\"，同时修改了4行，就会显示出这样的变化："

#. type: delimited block -
#: en/diff-format.txt:142
#, no-wrap, priority:280
msgid "arch/{i386 => x86}/Makefile    |   4 +--\n"
msgstr "arch/{i386 => x86}/Makefile    |   4 +--\n"

#. type: Plain text
#: en/diff-format.txt:147
#, priority:280
msgid "The `--numstat` option gives the diffstat(1) information but is designed for easier machine consumption.  An entry in `--numstat` output looks like this:"
msgstr ""
"`--numstat` 选项提供了 diffstat(1) 的信息，但其是为了方便程序使用而设计的。`--numstat` 输出中的一个条目如下："

#. type: delimited block -
#: en/diff-format.txt:151
#, no-wrap, priority:280
msgid ""
"1\t2\tREADME\n"
"3\t1\tarch/{i386 => x86}/Makefile\n"
msgstr ""
"1\t2\tREADME\n"
"3\t1\tarch/{i386 => x86}/Makefile\n"

#. type: Plain text
#: en/diff-format.txt:154
#, priority:280
msgid "That is, from left to right:"
msgstr "从左至右依次是："

#. type: Plain text
#: en/diff-format.txt:156 en/diff-format.txt:172
#, priority:280
msgid "the number of added lines;"
msgstr "添加的行数；"

#. type: Plain text
#: en/diff-format.txt:157 en/diff-format.txt:159 en/diff-format.txt:173 en/diff-format.txt:175
#, priority:280
msgid "a tab;"
msgstr "制表符；"

#. type: Plain text
#: en/diff-format.txt:158 en/diff-format.txt:174
#, priority:280
msgid "the number of deleted lines;"
msgstr "删除的行数；"

#. type: Plain text
#: en/diff-format.txt:160
#, priority:280
msgid "pathname (possibly with rename/copy information);"
msgstr "路径名（可能有重命名/复制信息）；"

#. type: Plain text
#: en/diff-format.txt:161
#, priority:280
msgid "a newline."
msgstr "换行符。"

#. type: Plain text
#: en/diff-format.txt:163
#, priority:280
msgid "When `-z` output option is in effect, the output is formatted this way:"
msgstr "当 `-z` 输出选项生效时，输出的格式如下："

#. type: delimited block -
#: en/diff-format.txt:167
#, no-wrap, priority:280
msgid ""
"1\t2\tREADME NUL\n"
"3\t1\tNUL arch/i386/Makefile NUL arch/x86/Makefile NUL\n"
msgstr ""
"1\t2\tREADME NUL\n"
"3\t1\tNUL arch/i386/Makefile NUL arch/x86/Makefile NUL\n"

#. type: Plain text
#: en/diff-format.txt:170
#, priority:280
msgid "That is:"
msgstr "依次是："

#. type: Plain text
#: en/diff-format.txt:176 en/diff-format.txt:178
#, priority:280
msgid "a NUL (only exists if renamed/copied);"
msgstr "NUL（仅在重命名/复制时存在）；"

#. type: Plain text
#: en/diff-format.txt:177
#, priority:280
msgid "pathname in preimage;"
msgstr "完整路径名；"

#. type: Plain text
#: en/diff-format.txt:179
#, priority:280
msgid "pathname in postimage (only exists if renamed/copied);"
msgstr "完整路径名（仅在重命名/复制时存在）；"

#. type: Plain text
#: en/diff-format.txt:180
#, priority:280
msgid "a NUL."
msgstr "NUL。"

#. type: Plain text
#: en/diff-format.txt:185
#, fuzzy, priority:280
msgid "The extra `NUL` before the preimage path in renamed case is to allow scripts that read the output to tell if the current record being read is a single-path record or a rename/copy record without reading ahead.  After reading added and deleted lines, reading up to `NUL` would yield the pathname, but if that is `NUL`, the record will show two paths."
msgstr ""
"在重命名的情况下，完整路径前多出的 `NUL` "
"为了让读取输出的脚本能够判断，当前被读取的记录是单路径记录还是重命名/复制记录，而不需要提前读取。在读完增删行数后，读至 `NUL` 会得到路径名，"
"但如果先读到 `NUL`，记录将显示两个路径。"

#. type: Title -
#: en/diff-generate-patch.txt:2
#, no-wrap, priority:260
msgid "Generating patch text with -p"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:14
#, priority:260
msgid "Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-files[1] with the `-p` option produces patch text.  You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:17
#, priority:260
msgid "What the -p option produces is slightly different from the traditional diff format:"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:19
#, priority:260
msgid "It is preceded with a \"git diff\" header that looks like this:"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:21
#, no-wrap, priority:260
msgid "diff --git a/file1 b/file2\n"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:25
#, priority:260
msgid "The `a/` and `b/` filenames are the same unless rename/copy is involved.  Especially, even for a creation or a deletion, `/dev/null` is _not_ used in place of the `a/` or `b/` filenames."
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:29
#, priority:260
msgid "When rename/copy is involved, `file1` and `file2` show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively."
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:31
#, priority:260
msgid "It is followed by one or more extended header lines:"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:43
#, no-wrap, priority:260
msgid ""
"old mode <mode>\n"
"new mode <mode>\n"
"deleted file mode <mode>\n"
"new file mode <mode>\n"
"copy from <path>\n"
"copy to <path>\n"
"rename from <path>\n"
"rename to <path>\n"
"similarity index <number>\n"
"dissimilarity index <number>\n"
"index <hash>..<hash> <mode>\n"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:46
#, priority:260
msgid "File modes are printed as 6-digit octal numbers including the file type and file permission bits."
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:48
#, priority:260
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:55
#, priority:260
msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines.  It is a rounded down integer, followed by a percent sign.  The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:59
#, priority:260
msgid "The index line includes the blob object names before and after the change.  The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:63
#, priority:260
msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:68
#, priority:260
msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit.  It is incorrect to apply each change to each file sequentially.  For example, this patch will swap a and b:"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:75
#, no-wrap, priority:260
msgid ""
"diff --git a/a b/b\n"
"rename from a\n"
"rename to b\n"
"diff --git a/b b/a\n"
"rename from b\n"
"rename to a\n"
msgstr ""

#. type: Title -
#: en/diff-generate-patch.txt:78
#, no-wrap, priority:260
msgid "Combined diff format"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:86
#, priority:260
msgid "Any diff-generating command can take the `-c` or `--cc` option to produce a 'combined diff' when showing a merge. This is the default format when showing merges with linkgit:git-diff[1] or linkgit:git-show[1]. Note also that you can give the `-m` option to any of these commands to force generation of diffs with individual parents of a merge."
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:88
#, priority:260
msgid "A \"combined diff\" format looks like this:"
msgstr ""

#. type: delimited block -
#: en/diff-generate-patch.txt:97
#, no-wrap, priority:260
msgid ""
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
"--- a/describe.c\n"
"+++ b/describe.c\n"
"@@@ -98,20 -98,12 +98,20 @@@\n"
"\treturn (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;\n"
"  }\n"
msgstr ""

#. type: delimited block -
#: en/diff-generate-patch.txt:107
#, no-wrap, priority:260
msgid ""
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
"++static void describe(char *arg, int last_one)\n"
"  {\n"
" +\tunsigned char sha1[20];\n"
" +\tstruct commit *cmit;\n"
"\tstruct commit_list *list;\n"
"\tstatic int initialized = 0;\n"
"\tstruct commit_name *n;\n"
msgstr ""

#. type: delimited block -
#: en/diff-generate-patch.txt:117
#, no-wrap, priority:260
msgid ""
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
" +\tcmit = lookup_commit_reference(sha1);\n"
" +\tif (!cmit)\n"
" +\t\tusage(describe_usage);\n"
" +\n"
"\tif (!initialized) {\n"
"\t\tinitialized = 1;\n"
"\t\tfor_each_ref(get_name);\n"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:121
#, priority:260
msgid "It is preceded with a \"git diff\" header, that looks like this (when the `-c` option is used):"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:125
#, priority:260
msgid "or like this (when the `--cc` option is used):"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:127
#, no-wrap, priority:260
msgid "       diff --cc file\n"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:130
#, priority:260
msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:135
#, no-wrap, priority:260
msgid ""
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
"new file mode <mode>\n"
"deleted file mode <mode>,<mode>\n"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:141
#, priority:260
msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree-ish> and are not used by combined diff format."
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:143
#, priority:260
msgid "It is followed by two-line from-file/to-file header"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:145 en/diff-generate-patch.txt:156 en/diff-generate-patch.txt:157 en/diff-generate-patch.txt:158
#, priority:260
msgid "a/file"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:146 en/diff-generate-patch.txt:159
#, priority:260
msgid "b/file"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:150
#, priority:260
msgid "Similar to two-line header for traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:154
#, priority:260
msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file you get a N+1 line from-file/to-file header, where N is the number of parents in the merge commit"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:163
#, priority:260
msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:169
#, priority:260
msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:171
#, no-wrap, priority:260
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:174
#, priority:260
msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:183
#, ignore-ellipsis, priority:260
msgid "Unlike the traditional 'unified' diff format, which shows two files A and B with a single column that has `-` (minus -- appears in A but removed in B), `+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN.  One column for each of fileN is prepended to the output line to note how X's line is different from it."
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:189
#, priority:260
msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result.  A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:195
#, priority:260
msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2).  Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
msgstr ""

#. type: Plain text
#: en/diff-generate-patch.txt:201
#, priority:260
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 ""

#. type: Labeled list
#: en/diff-options.txt:17 en/git-rebase.txt:374 en/merge-options.txt:90
#, 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:205 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
#, ignore-same, no-wrap, priority:300
msgid "-u"
msgstr "-u"

#. type: Labeled list
#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:268 en/git-commit.txt:72 en/git-restore.txt:48 en/git-stash.txt:184
#, ignore-same, no-wrap, priority:300
msgid "--patch"
msgstr "--patch"

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

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

#. type: Labeled list
#: en/diff-options.txt:30 en/git-am.txt:34 en/git-blame.txt:75 en/git-cat-file.txt:40 en/git-cherry-pick.txt:105 en/git-clone.txt:66 en/git-commit.txt:166 en/git-diff-tree.txt:72 en/git-format-patch.txt:119 en/git-ls-files.txt:59 en/git-revert.txt:97 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
#, ignore-same, no-wrap, priority:300
msgid "-s"
msgstr "-s"

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

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

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

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

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

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

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

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

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

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

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

#. type: Plain text
#: en/diff-options.txt:53
#, 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:55 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:58
#, no-wrap, priority:280
msgid "\tGenerate the diff in raw format.\n"
msgstr "\t生成原始格式的差异。\n"

#. type: Plain text
#: en/diff-options.txt:68
#, 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:72
#, ignore-same, no-wrap, priority:280
msgid "--patch-with-raw"
msgstr "--patch-with-raw"

#. type: Plain text
#: en/diff-options.txt:74
#, fuzzy, priority:280
msgid "Synonym for `-p --raw`."
msgstr " '-p --raw' "

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

#. type: Plain text
#: en/diff-options.txt:79
#, 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:80
#, ignore-same, no-wrap, priority:280
msgid "--no-indent-heuristic"
msgstr "--no-indent-heuristic"

#. type: Plain text
#: en/diff-options.txt:82
#, priority:280
msgid "Disable the indent heuristic."
msgstr ""

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

#. type: Plain text
#: en/diff-options.txt:86 en/diff-options.txt:112
#, priority:280
msgid "Spend extra time to make sure the smallest possible diff is produced."
msgstr ""

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

#. type: Plain text
#: en/diff-options.txt:89
#, fuzzy, priority:280
msgid "Generate a diff using the \"patience diff\" algorithm."
msgstr " \"patience diff\" "

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

#. type: Plain text
#: en/diff-options.txt:92
#, fuzzy, priority:280
msgid "Generate a diff using the \"histogram diff\" algorithm."
msgstr " \"histogram diff\" "

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

#. type: Plain text
#: en/diff-options.txt:95
#, fuzzy, priority:280
msgid "Generate a diff using the \"anchored diff\" algorithm."
msgstr " \"anchored diff\" "

#. type: Plain text
#: en/diff-options.txt:97
#, priority:280
msgid "This option may be specified more than once."
msgstr ""

#. type: Plain text
#: en/diff-options.txt:102
#, 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 ""

#. type: Labeled list
#: en/diff-options.txt:103
#, 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:105
#, priority:280
msgid "Choose a diff algorithm. The variants are as follows:"
msgstr ""

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

#. type: Plain text
#: en/diff-options.txt:109
#, priority:280
msgid "The basic greedy diff algorithm. Currently, this is the default."
msgstr ""

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

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

#. type: Plain text
#: en/diff-options.txt:114
#, priority:280
msgid "Use \"patience diff\" algorithm when generating patches."
msgstr ""

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

#. type: Plain text
#: en/diff-options.txt:117
#, priority:280
msgid "This algorithm extends the patience algorithm to \"support low-occurrence common elements\"."
msgstr ""

#. type: Plain text
#: en/diff-options.txt:122
#, 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 ""

#. type: Labeled list
#: en/diff-options.txt:123
#, fuzzy, no-wrap, priority:280
msgid "--stat[=<width>[,<name-width>[,<count>]]]"
msgstr "<>[,<>[,<>]]"

#. type: Plain text
#: en/diff-options.txt:137
#, 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 ""

#. type: Plain text
#: en/diff-options.txt:140
#, priority:280
msgid "These parameters can also be set individually with `--stat-width=<width>`, `--stat-name-width=<name-width>` and `--stat-count=<count>`."
msgstr ""

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

#. type: Plain text
#: en/diff-options.txt:148
#, 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 ""

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

#. type: Plain text
#: en/diff-options.txt:155
#, 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 ""

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

#. type: Plain text
#: en/diff-options.txt:160
#, 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 ""

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

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

#. type: Plain text
#: en/diff-options.txt:169
#, 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 ""

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

#. type: Plain text
#: en/diff-options.txt:177
#, 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:177
#, ignore-same, no-wrap, priority:280
msgid "`lines`"
msgstr "`lines`"

#. type: Plain text
#: en/diff-options.txt:185
#, 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 ""

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

#. type: Plain text
#: en/diff-options.txt:190
#, 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 ""

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

#. type: Plain text
#: en/diff-options.txt:195
#, 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 ""

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