git documentation - en to zh_HANS-CN translation catalogue (127 entries)

note: type: Plain text
en: Annotate only the line range given by '<start>,<end>', or by the function name regex '<funcname>'.  May be specified multiple times. Overlapping ranges are allowed.
zh_HANS-CN: 仅注释由'<start>，<end>'或功能名称正则表达式'<funcname>'给出的行范围。 可以指定多次。 允许重叠范围。

note: type: Plain text
en: '<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans from '<start>' to end of file. `-L ,<end>` spans from start of file to '<end>'.
zh_HANS-CN: '<start>' 和 '<end>' 是可选的 `-L <start>` 或 `-L <start>,` 范围从 '<start>' 到文件末尾。 `-L ,<end>` 从文件开始到 '<end>'.

note: type: Plain text
en: Show long rev (Default: off).
zh_HANS-CN: 显示长转（默认值：关闭）。

note: type: Plain text
en: Show raw timestamp (Default: off).
zh_HANS-CN: 显示原始时间戳（默认值：关闭）。

note: type: Plain text
en: Use revisions from revs-file instead of calling linkgit:git-rev-list[1].
zh_HANS-CN: 使用revs-file中的修订，而不是调用linkgit：git-rev-list [1]。

note: type: Plain text
en: Walk history forward instead of backward. Instead of showing the revision in which a line appeared, this shows the last revision in which a line has existed. This requires a range of revision like START..END where the path to blame exists in START.  `git blame --reverse START` is taken as `git blame --reverse START..HEAD` for convenience.
zh_HANS-CN: 向前调用历史记录，而不向后调用历史记录。 与其显示行所在的修订，不显示行所在的最后一个修订。 这就需要进行一系列修订，例如START..END，其中的归咎路径在START中。 为方便起见，将git blame --reverse START。当作git blame --reverse START..HEAD。

note: type: Labeled list
en: -p
zh_HANS-CN: -pattystackzzcryp3c

note: type: Plain text
en: In addition to recognizing all date formats above, the `--date` option will also try to make sense of other, more human-centric date formats, such as relative dates like "yesterday" or "last Friday at noon".
zh_HANS-CN: 除了识别上述所有日期格式外，`--date` 选项还将尝试理解其它非标准化的日期格式，如 "昨天" 或 "上周五中午" 等相对日期。

note: type: Title -
en: Generating patch text with -p
zh_HANS-CN: 使用选项 `-p` 生成补丁文本

note: type: Plain text
en: 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 (see linkgit:git[1]).
zh_HANS-CN: 运行 linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], 或 linkgit:git-diff-files[1] 时带有 `-p` 选项会生成补丁文本。你可以通过 `GIT_EXTERNAL_DIFF` 和 `GIT_DIFF_OPTS` 环境变量来定制补丁文本创建（参见 linkgit:git[1]）。

note: type: Plain text
en: What the -p option produces is slightly different from the traditional diff format:
zh_HANS-CN: -p 选项产生的内容与传统的差异格式略有不同：

note: type: Plain text
en: It is preceded with a "git diff" header that looks like this:
zh_HANS-CN: 它前面有一个 `git diff` 头，如下所示：

note: type: Plain text
en: 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.
zh_HANS-CN: `a/` 和 `b/` 的文件名相同，除非涉及到重命名/复制。特别地，即使是创建或删除，也 _不_ 使用 `/dev/null` 来代替 `a/` 或 `b/` 文件名。

note: type: Plain text
en: 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.
zh_HANS-CN: 当涉及到重命名/复制时，`file1` 和 `file2` 分别显示重命名/复制的源文件的名称和重命名/复制产生的文件的名称。

note: type: Plain text
en: It is followed by one or more extended header lines:
zh_HANS-CN: 它的后面是一个或多个扩展头信息行：

note: type: Plain text
en: old mode <mode>
    new mode <mode>
    deleted file mode <mode>
    new file mode <mode>
    copy from <path>
    copy to <path>
    rename from <path>
    rename to <path>
    similarity index <number>
    dissimilarity index <number>
    index <hash>..<hash> <mode>
zh_HANS-CN: old mode <模式>
    new mode <模式>
    deleted file mode <模式>
    new file mode <模式>
    copy from <路径>
    copy to <路径>
    rename from <路径>
    rename to <路径>
    similarity index <数字>
    dissimilarity index <数字>
    index <哈希>..<哈希> <模式>

note: type: Plain text
en: File modes are printed as 6-digit octal numbers including the file type and file permission bits.
zh_HANS-CN: 文件模式被打印为6位八进制数字，包括文件类型和文件权限位。

note: type: Plain text
en: Path names in extended headers do not include the `a/` and `b/` prefixes.
zh_HANS-CN: 扩展头信息中的路径名称不包括 `a/` 和 `b/` 前缀。

note: type: Plain text
en: 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.
zh_HANS-CN: 相似性指数是未改变的行占比，而不相似性指数是改变的行占比。它是四舍五入的整数，后有百分号。因此，100%的相似度指数指为两个文件相等，而 100% 的不相似度意味着入新文件中没有旧文件中的行。

note: type: Plain text
en: 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.
zh_HANS-CN: 索引行包括改变前和改变后的 blob 对象名称。如果文件模式没有变化，则包含 <模式>；否则，分别显示新旧模式。

note: type: Plain text
en: Pathnames with "unusual" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]).
zh_HANS-CN: 含有 "不常见" 字符的路径名会被引用，这一点在配置变量` core.quotePath` 中有所解释（见 linkgit:git-config[1]）。

note: type: Plain text
en: 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:
zh_HANS-CN: 输出中所有的 `file1` 文件都是指提交前的文件，而所有的 `file2` 文件都是指提交后的文件。按顺序对每个文件进行修改是不正确的。例如，这个补丁将交换文件 a 和 b：

note: type: Title -
en: Combined diff format
zh_HANS-CN: 合并的差异格式

note: type: Plain text
en: 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 suitable `--diff-merges` option to any of these commands to force generation of diffs in specific format.
zh_HANS-CN: 任何生成差异的命令都可以使用 `-c` 或 `-cc` 选项，在显示合并时产生一个 "合并差异"。当用 linkgit:git-diff[1] 或 linkgit:git-show[1] 显示合并时，这默认格式。还需要注意的是，你可以给这些命令适当的 `--diff-merges` 选项来强制生成特定格式的差异。

note: type: Plain text
en: A "combined diff" format looks like this:
zh_HANS-CN: "合并的差异" 的格式如下：

note: type: Plain text
en: It is preceded with a "git diff" header, that looks like this (when the `-c` option is used):
zh_HANS-CN: 它前面有 "git diff" 头，如下（当使用 `c` 选项时）：

note: type: Plain text
en: or like this (when the `--cc` option is used):
zh_HANS-CN: 或如下（当使用 `--cc` 选项时）：

note: type: Plain text
en: It is followed by one or more extended header lines (this example shows a merge with two parents):
zh_HANS-CN: 它的后面是一个或多个扩展头信息行（本例显示的是与两个父提交的合并）：

note: type: Plain text
en: index <hash>,<hash>..<hash>
    mode <mode>,<mode>..<mode>
    new file mode <mode>
    deleted file mode <mode>,<mode>
zh_HANS-CN: index <哈希>,<哈希>..<哈希>
    mode <模式>,<模式>..<模式>
    new file mode <模式>
    deleted file mode <模式>,<模式>

note: type: Plain text
en: It is followed by two-line from-file/to-file header
zh_HANS-CN: 它的后面是两行源文件/目标文件的头信息

note: type: Plain text
en: a/file
zh_HANS-CN: Index.pg

note: type: Plain text
en: Similar to two-line header for traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files.
zh_HANS-CN: 类似于传统的 "统一" 差异格式的双行头，`/dev/null` 用来表示创建或删除的文件。

note: type: Plain text
en: 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
zh_HANS-CN: 但是，如果提供了 --combined-all-paths 选项，你就会得到一个 N+1 行的源文件/目标文件头，其中 N 是合并提交中的父提交数量

note: type: Plain text
en: 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.
zh_HANS-CN: 如果重命名或复制检测处于活动状态，这种扩展格式可能很有用，可以让你在不同的父提交中看到文件的原始名称。

note: type: Plain text
en: 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:
zh_HANS-CN: 修改了文件块头信息的格式，以防止不小心将其送入 `patch -p1`。合并的差异格式是为审查合并提交的修改而创建的，并不是为了应用。这个变化类似于扩展的 "索引" 头信息的变化：

note: type: Plain text
en: There are (number of parents + 1) `@` characters in the chunk header for combined diff format.
zh_HANS-CN: 块中有（父提交数量+1）`@` 字符，用于合并的差异格式。

note: type: Plain text
en: 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.
zh_HANS-CN: 与传统的 "统一" 差异格式不同，这种格式显示两个文件 A 和 B 的列，其中有 `-`（减号 -- 在 A 中出现，但在 B 中删除），`+`（加号 -- 在 A 中缺少，但在 B 中增加），或 `" "`（空格 -- 不变）前缀，这种格式比较两个或多个文件与一个文件 X，并显示 X 与其中每个文件的差异。文件中的每一个都有一列被前置在输出行中，以指出 X 的行与它的不同之处。

note: type: Plain text
en: 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).
zh_HANS-CN: 第 N 列中的 `-` 字符意味着该行出现在文件 N 中，但它没有出现在结果文件中。第 N 列中的 `+` 字符意味着该行出现在结果文件中，而文件 N 中没有该行（换句话说，从该父提交的角度来看，该行是被添加的）。

note: type: Plain text
en: 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 `+`).
zh_HANS-CN: 在上面的输出示例中，两个文件中的函数签名都被改变了（因此从文件 1 和文件 2 中都有表示删除的 `-`，而 `++` 表示被添加的一行没有出现在文件 1 或文件 2 中）。另外还有 8 行与文件 1 中的相同，但没有出现在文件 2 中（因此前缀为 `+`）。

note: type: Plain text
en: 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").
zh_HANS-CN: 当用 `git diff-tree -c` 显示时，它将合并提交的父提交文件与合并结果进行比较（即文件 1 ... 文件 N 是父提交文件）。当用 `git diff-files -c` 显示时，它将两个未解决的合并父提交文件与工作树文件进行比较（即文件 1 是阶段 2 ，又称 "我们的版本"，文件 2 是阶段 3，又称 "他们的版本"）。

note: type: Plain text
en: 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.
zh_HANS-CN: 指定合并提交时使用的差异格式。默认为 {diff-merges-default}，但当使用 `--first-parent` 选项时，默认为 `first-parent`。

note: type: Plain text
en: Disable output of diffs for merge commits. Useful to override implied value.
zh_HANS-CN: 禁用合并提交时的差异输出。对覆盖隐含值很有用。

note: type: Plain text
en: This option makes merge commits show the full diff with respect to the first parent only.
zh_HANS-CN: 此选项使合并提交只显示与第一个父提交之间的完整差异。

note: type: Plain text
en: 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`.
zh_HANS-CN: 这使得合并提交显示了每个父提交之间的完整差异。每个父提交都会产生单独的日志项和差异。`-m` 选项在没有 `-p` 选项时不会产生任何输出。

note: type: Plain text
en: 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`.
zh_HANS-CN: 使用此选项，合并提交的差异输出将同时显示每个父提交与合并结果的差异，而不是一次显示一个父提交与结果之间的成对差异 。此外，它只列出所有父提交中修改的文件。`-c` 选项暗含 `-p` 选项。

note: type: Plain text
en: 	If `n` is specified, it is a threshold on the similarity
    	index (i.e. amount of addition/deletions compared to the
    	file's size). For example, `-M90%` means Git should consider a
    	delete/add pair to be a rename if more than 90% of the file
    	hasn't changed.  Without a `%` sign, the number is to be read as
    	a fraction, with a decimal point before it.  I.e., `-M5` becomes
    	0.5, and is thus the same as `-M50%`.  Similarly, `-M05` is
    	the same as `-M5%`.  To limit detection to exact renames, use
    	`-M100%`.  The default similarity index is 50%.
zh_HANS-CN: 	如果指定了 `n`，则其为相似度指数阈值（即相比于文件大小的增/删量）。
    	例如，`-M90％` 表示如果文件90％以上的内容没有更改，则 Git 应将删除/添加对视为重命名。
    	如果没有 `％` 符号，则该数字应作为小数读取，并在其前面加上小数点。
     	即 `-M5` 变为 0.5，因此与 `-M50％` 相同。 同样，`-M05` 与 `-M5％` 相同。
     	要将检测限制为精确的重命名，请使用 `-M100％`。 默认相似度指数为50％。

note: type: Plain text
en: Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and `/dev/null`. The resulting patch is not meant to be applied with `patch` or `git apply`; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lacks enough information to apply such a patch in reverse, even manually, hence the name of the option.
zh_HANS-CN: 删除时省略原内容，即只打印头信息，而不打原内容和 `/dev/null` 之间的差异。所产生的补丁并不是要用于 `patch` 或 `git apply`；这只是为了让人们只专注于审查修改后的文本。此外，输出结果显然缺乏足够的信息来反转，或手动应用这样一个补丁，因此这个选项的名称如此。

note: type: Plain text
en: When used together with `-B`, omit also the preimage in the deletion part of a delete/create pair.
zh_HANS-CN: 当与 `-B` 一起使用时，也省略删除/创建对中删除部分的原内容。

note: type: Labeled list
en: -l<num>
zh_HANS-CN: -l<数量>

note: type: Plain text
en: The `-M` and `-C` options require O(n^2) processing time where n is the number of potential rename/copy targets.  This option prevents rename/copy detection from running if the number of rename/copy targets exceeds the specified number.
zh_HANS-CN: `-M` 和 `-C` 选项需要 O(n^2) 的处理时间，其中 n 是潜在的重命名/复制目标数量。如果重命名/复制目标的数量超过了指定的数量，该选项可防止重命名/复制检测运行。

note: type: Plain text
en: Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or have had their pairing Broken (`B`).  Any combination of the filter characters (including none) can be used.  When `*` (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected.
zh_HANS-CN: 只选择添加（`A`）、复制（`C`）、删除（`D`）、修改（`M`）、重命名（`R`）、类型（即常规文件、符号链接、子模块......）改变（`T`）、未合并（`U`）、未知（`X`）或配对被破坏（`B`）的文件。可以使用过滤字符的任何组合（包括空）。当组合中加入 `*`（全部或空）时，如果在比较中有任何文件与其他条件匹配，则选择所有路径；如果没有符合其他条件的文件，则不会选择任何内容。

note: type: Plain text
en: Also, these upper-case letters can be downcased to exclude.  E.g.  `--diff-filter=ad` excludes added and deleted paths.
zh_HANS-CN: 另外，这些大写字母也可以通过使用小写排除。例如：`--diff-filter=ad` 排除添加和删除的路径。

note: type: Plain text
en: Note that not all diffs can feature all types. For instance, diffs from the index to the working tree can never have Added entries (because the set of paths included in the diff is limited by what is in the index).  Similarly, copied and renamed entries cannot appear if detection for those types is disabled.
zh_HANS-CN: 请注意，并不是所有的差异都能包含所有类型。例如，从索引到工作树的差异永远不会有添加（Added）条目（因为差异中包含的路径集受索引中的内容的限制）。同样，如果禁止检测复制和重命名的条目，这些类型也不会出现。

note: type: Plain text
en: Look for differences that change the number of occurrences of the specified string (i.e. addition/deletion) in a file.  Intended for the scripter's use.
zh_HANS-CN: 寻找改变文件中指定字符串出现次数的差异（即增加/删除）。供脚本编写者使用。

note: type: Plain text
en: Binary files are searched as well.
zh_HANS-CN: 二进制文件也会被搜索到。

note: type: Plain text
en: Look for differences whose patch text contains added/removed lines that match <regex>.
zh_HANS-CN: 查找其补丁文本包含与 <正则表达式> 匹配的添加/删除行的差异。

note: type: Plain text
en: To illustrate the difference between `-S<regex> --pickaxe-regex` and `-G<regex>`, consider a commit with the following diff in the same file:
zh_HANS-CN: 为了说明 `-S<正则表达式> --pickaxe-regex` 和 `-G<正则表达式>` 之间的区别，假设某次提交在同一文件中有以下差异：

note: type: Plain text
en: While `git log -G"frotz\(nitfol"` will show this commit, `git log -S"frotz\(nitfol" --pickaxe-regex` will not (because the number of occurrences of that string did not change).
zh_HANS-CN: `git log -G "frotz\(nitfol"` 会显示这次提交，但 `git log -S "frotz\(nitfol" --pickaxe-regex` 不会显示（因为该字符串的出现次数没有改变）。

note: type: Plain text
en: See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information.
zh_HANS-CN: 更多信息请参见 linkgit:gitdiffcore[7] 中的 'pickaxe' 条目。

note: type: Plain text
en: Look for differences that change the number of occurrences of the specified object. Similar to `-S`, just the argument is different in that it doesn't search for a specific string but for a specific object id.
zh_HANS-CN: 查找指定对象出现次数的差异。与 `-S` 类似，只是参数不同：它不搜索特定的字符串，而是搜索特定的对象 id。

note: type: Plain text
en: The object can be a blob or a submodule commit. It implies the `-t` option in `git-log` to also find trees.
zh_HANS-CN: 该对象可以是一个 blob 或一个子模块提交。它意味着 `git-log` 中的 `-t` 选项也能找到工作树。

note: type: Plain text
en: When `-S` or `-G` finds a change, show all the changes in that changeset, not just the files that contain the change in <string>.
zh_HANS-CN: 当使用 `-S` 或 `-G` 选项找到一个更改时，显示该更改集中的所有更改，而不仅仅是显示包含 <string> 更改的文件。

note: type: Plain text
en: Treat the <string> given to `-S` as an extended POSIX regular expression to match.
zh_HANS-CN: 将 `-S` 选项的 <string> 参数当作扩展的 POSIX 正则表达式来匹配。

note: type: Labeled list
en: -O<orderfile>
zh_HANS-CN: -O<顺序控制文件>

note: type: Plain text
en: Control the order in which files appear in the output.  This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]).  To cancel `diff.orderFile`, use `-O/dev/null`.
zh_HANS-CN: 控制文件在输出中出现的顺序。这将覆盖 `diff.orderFile` 配置变量（参见 linkgit:git-config[1]）。要取消 `diff.orderFile`，请使用 `-O/dev/null`。

note: type: Plain text
en: The output order is determined by the order of glob patterns in <orderfile>.  All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on.  All files with pathnames that do not match any pattern are output last, as if there was an implicit match-all pattern at the end of the file.  If multiple pathnames have the same rank (they match the same pattern but no earlier patterns), their output order relative to each other is the normal order.
zh_HANS-CN: 输出顺序由 <顺序控制文件> 中的 glob 模式的顺序决定。所有路径名与第一个模式匹配的文件首先输出，路径名与第二个模式匹配（但不与第一个模式匹配）的文件其次输出，以此类推。所有路径名与任何模式匹配的文件会最后输出，就像在文件末尾有一个隐含的全部匹配模式。如果多个路径名具有相同的等级（它们匹配相同的模式，但没有匹配先前的模式），它们相对于彼此的输出顺序是正常的。

note: type: Plain text
en: <orderfile> is parsed as follows:
zh_HANS-CN: <顺序控制文件> 格式如下：

note: type: Plain text
en: Blank lines are ignored, so they can be used as separators for readability.
zh_HANS-CN: 空白行会被忽略，因此可以用它们作为分隔符，以保证可读性。

note: type: Plain text
en: Lines starting with a hash ("`#`") are ignored, so they can be used for comments.  Add a backslash ("`\`") to the beginning of the pattern if it starts with a hash.
zh_HANS-CN: 以井号（"`#`"）开头的行会被忽略，所以它们可以用来做注释。如果模式以井号开头，则需要在模式的开头加上反斜杠（"`\`"）。

note: type: Plain text
en: Each other line contains a single pattern.
zh_HANS-CN: 每一行都包含一个模式。

note: type: Plain text
en: Patterns have the same syntax and semantics as patterns used for fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern.  For example, the pattern "`foo*bar`" matches "`fooasdfbar`" and "`foo/bar/baz/asdf`" but not "`foobarx`".
zh_HANS-CN: 模式的语法和语义与 fnmatch(3) 中使用的相同，不包括 FNM_PATHNAME 标志，但在删除路径名中结尾任意几个成分后匹配的情况下例外。例如，模式 "`foo*bar`" 匹配 "`fooasdfbar`" 和 "`foo/bar/baz/asdf`"，但不匹配 "`foobarx`"。

note: type: Plain text
en: Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to').  These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise.
zh_HANS-CN: 从输出中丢弃命名为 <文件> 之前的文件（即 '跳过'），或将它们移到输出的末尾（即 '旋转'）。这些选项主要是为了使用 `git difftool` 命令而添加的，在其他情况下可能不是很有用。

note: type: Plain text
en: Swap two inputs; that is, show differences from index or on-disk file to tree contents.
zh_HANS-CN: 交换两个输入；即显示从索引或磁盘文件到目录树内容的差异。

note: type: Labeled list
en: --relative[=<path>]
zh_HANS-CN: --relative[=<路径>]

note: type: Plain text
en: When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`.
zh_HANS-CN: 当从项目的子目录中运行时，可以排除目录外的变化，并通过这个选项显示相对于它的路径名。当你不在子目录中时（例如在纯仓库中），你可以通过 <路径> 参数来指明要使输出相对于哪个子目录。`--no-relative` 可以用来取消 `diff.relative`配置选项和之前的 `--relative` 选项。

note: type: Plain text
en: Ignore carriage-return at the end of line when doing a comparison.
zh_HANS-CN: 在进行比较时，忽略行末的回车。

note: type: Plain text
en: Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none.
zh_HANS-CN: 比较行时忽略空格。即使一行有空格而另一行没有空格，也会忽略差异。

note: type: Plain text
en: Ignore changes whose lines are all blank.
zh_HANS-CN: 忽略空白行的变化。

note: type: Plain text
en: Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset.
zh_HANS-CN: 显示块差异之间的上下文，最多显示指定的行数，从而合并彼此接近的块。 默认认为 `diff.interHunkContext`，如果配置选项未设置，则默认为0。

note: type: Plain text
en: Show whole function as context lines for each change.  The function names are determined in the same way as `git diff` works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5]).
zh_HANS-CN: 在每个修改中的上下文行显示整个函数。函数名称的确定方式与 `git diff` 计算补丁头的方式相同（参见 linkgit:gitattributes[5] 中的 '自定义区块头' ）。

note: type: Plain text
en: Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences.
zh_HANS-CN: 让程序以类似 diff(1) 的代码退出。也就是说，如果有差异则返回1，否则返回0。

note: type: Plain text
en: Disable all output of the program. Implies `--exit-code`.
zh_HANS-CN: 禁用程序的所有输出。暗含 `--exit-code`。

note: type: Plain text
en: Disallow external diff drivers.
zh_HANS-CN: 禁止使用外部差异器。

note: type: Plain text
en: Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands.
zh_HANS-CN: 允许（或不允许）在比较二进制文件时运行外部文本转换过滤器。详情请参见 linkgit:gitattributes[5] 。由于文本转换过滤器通常是单向转换，因此产生的差异适合人类用户使用，但不能应用（apply）。因此默认情况下，只有 linkgit:git-diff[1] 和 linkgit:git-log[1] 启用文本转换过滤器，而 linkgit:git-format-patch[1] 或 diff plumbing 命令则不启用。

note: type: Plain text
en: Ignore changes to submodules in the diff generation. <when> can be either "none", "untracked", "dirty" or "all", which is the default.  Using "none" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When "untracked" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using "dirty" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using "all" hides all changes to submodules.
zh_HANS-CN: 在生成差异时忽略子模块的修改。<when> 可以是 "none"、"untracked"、"dirty " 或 "all"，"all" 是默认选项。使用 "none" 会在子模块包含未跟踪或修改的文件，或者它的HEAD 与上级项目中记录的提交不同时，认为它被修改了，并且可以用来覆盖 linkgit:git-config[1] 或 linkgit:gitmodules[5] 中 '忽略' 选项的设置。当使用 "untracked" 时，当子模块只包含未跟踪的内容时，它们不会被认为是有改动的（但它们仍然会被扫描是否有被修改的内容）。使用 "dirty" 会忽略所有对子模块工作树的修改，只有存储在上级项目中的提交的修改才会被显示出来（这是在1.7.0之前的行为）。使用 "all" 会隐藏所有对子模块的修改。

note: type: Plain text
en: Do not show any source or destination prefix.
zh_HANS-CN: 不显示任何源或目的前缀。

note: type: Plain text
en: Prepend an additional prefix to every line of output.
zh_HANS-CN: 在每一行输出前加上一个额外的前缀。

note: type: Plain text
en: By default entries added by "git add -N" appear as an existing empty file in "git diff" and a new file in "git diff --cached".  This option makes the entry appear as a new file in "git diff" and non-existent in "git diff --cached". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future.
zh_HANS-CN: 默认情况下，通过 "git add -N" 添加的条目在 "git diff" 中显示为现有的空文件，在 "git diff --cached" 中显示为新文件。这个选项使得条目在 "git diff" 中显示为一个新文件，而在 "git diff --cached" 中显示为不存在的文件。这个选项可以用 `--ita-visible-in-index` 来还原。这两个选项都是试验性的，将来可能会被删除。

note: type: Plain text
en: For more detailed explanation on these common options, see also linkgit:gitdiffcore[7].
zh_HANS-CN: 关于这些常用选项的更多解释，请参见 linkgit:gitdiffcore[7]。

note: type: Labeled list
en: --shallow-since=<date>
zh_HANS-CN: --shallow-since=<日期>

note: type: Labeled list
en: --shallow-exclude=<revision>
zh_HANS-CN: --shallow-exclude=<修订版本>

note: type: Plain text
en: Be verbose.
zh_HANS-CN: 详细日志。

note: type: Labeled list
en: -o <option>
zh_HANS-CN: -o <选项>

note: type: Labeled list
en: --server-option=<option>
zh_HANS-CN: --server-option=<选项>

note: type: Plain text
en: Transmit the given string to the server when communicating using protocol version 2.  The given string must not contain a NUL or LF character.  The server's handling of server options, including unknown ones, is server-specific.  When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line.
zh_HANS-CN: 使用协议版本2进行通信时，将给定的字符串传输到服务器。给定的字符串不得包含NUL或LF字符。服务器对服务器选项（包括未知选项）的处理是取决于服务器。当给出多个`--server-option = <option>`时，它们都按照命令行中列出的顺序发送到另一端。

note: type: Title -
en: NAME
zh_HANS-CN: 名称

note: type: Plain text
en: git-add - Add file contents to the index
zh_HANS-CN: git-add - 添加文件内容到索引

note: type: Title -
en: SYNOPSIS
zh_HANS-CN: 概述

note: type: Title -
en: DESCRIPTION
zh_HANS-CN: 描述

note: type: Plain text
en: This command updates the index using the current content found in the working tree, to prepare the content staged for the next commit.  It typically adds the current content of existing paths as a whole, but with some options it can also be used to add content with only part of the changes made to the working tree files applied, or remove paths that do not exist in the working tree anymore.
zh_HANS-CN: 该命令使用工作区的内容来更新索引，为下一次提交准备暂存的内容。通常情况下会添加当前目录的所有内容到索引，但是通过某些选项，它也可以用于仅添加对工作树文件所做的部分更改，或删除工作树中不存在的路径。

note: type: Plain text
en: The "index" holds a snapshot of the content of the working tree, and it is this snapshot that is taken as the contents of the next commit.  Thus after making any changes to the working tree, and before running the commit command, you must use the `add` command to add any new or modified files to the index.
zh_HANS-CN: 索引区中储存着一份工作区的快照，在下次提交时这份快照会被保存到 Git 仓库中。因此在工作区做过修改后以及在运行下一次提交命令前，你必须通过 `add` 命令来添加新创建的文件或者保存新的改动到索引中。

note: type: Plain text
en: The `git status` command can be used to obtain a summary of which files have changes that are staged for the next commit.
zh_HANS-CN: `git status` 命令可用于获取摘要，说明哪些变化的文件已暂存，准备下一次提交。

note: type: Plain text
en: The `git add` command will not add ignored files by default.  If any ignored files were explicitly specified on the command line, `git add` will fail with a list of ignored files.  Ignored files reached by directory recursion or filename globbing performed by Git (quote your globs before the shell) will be silently ignored.  The 'git add' command can be used to add ignored files with the `-f` (force) option.
zh_HANS-CN: `git add` 命令默认不会添加被忽略的文件。如果在命令行上明确指定了任何被忽略的文件，则`git add`会失败，并显示被忽略文件的列表。由目录递归或Git执行的文件名通配符（在shell之前引用的通配符）所涉及的忽略文件将被静默忽略。 'git add' 命令可用于通过 -f 选项（force）强制添加忽略的文件。

note: type: Plain text
en: Please see linkgit:git-commit[1] for alternative ways to add content to a commit.
zh_HANS-CN: 请参阅 linkgit:git-commit[1] 了解将内容添加到提交的其他替代方法。

note: type: Title -
en: OPTIONS
zh_HANS-CN: 选项

note: type: Plain text
en: For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7].
zh_HANS-CN: 有关 <指定路径> 格式的更多细节，请参考 linkgit:gitglossary[7]。

note: type: Plain text
en: This option can only be used together with --dry-run. By using this option the user can check if any of the given files would be ignored, no matter if they are already present in the work tree or not.
zh_HANS-CN: 此选项只能与--dry-run一起使用。通过使用此选项，用户可以检查是否会忽略任何给定的文件，无论它们是否已存在于工作树中。

note: type: Plain text
en: By default, `git add` will warn when adding an embedded repository to the index without using `git submodule add` to create an entry in `.gitmodules`. This option will suppress the warning (e.g., if you are manually performing operations on submodules).
zh_HANS-CN: 默认情况下， `git add` 将在向索引添加嵌入式存储库时发出警告，而不使用 `git submodule add` 在 `.gitmodules` 中创建条目。此选项将抑制警告（例如，如果手动对子模块执行操作）。

note: type: Plain text
en: Apply the "clean" process freshly to all tracked files to forcibly add them again to the index.  This is useful after changing `core.autocrlf` configuration or the `text` attribute in order to correct files added with wrong CRLF/LF line endings.  This option implies `-u`.
zh_HANS-CN: 对所有跟踪的文件应用`clean`过程，将它们再次强制添加到索引中。这在更改`core.autocrlf`配置或`text`属性以更正添加了错误CRLF/LF行结尾的文件后非常有用。此选项隐含`-u`选项。

note: type: Plain text
en: GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. `--no-gpg-sign` is useful to countermand both `commit.gpgSign` configuration variable, and earlier `--gpg-sign`.
zh_HANS-CN: GPG 签名提交。`keyid` 参数是可选的，默认为提交者身份；如果指定了，则必须与选项相连，不加空格。`--no-gpg-sign` 用于还原 `commit.gpgSign` 配置变量和先前的 `--gpg-sign`。

note: type: Title -
en: CONFIGURATION
zh_HANS-CN: 配置

note: type: Title -
en: SUBMODULES
zh_HANS-CN: 子模块

note: type: Labeled list
en: --column[=<options>]
zh_HANS-CN: --column[=<选项>]

note: type: Plain text
en: Do not interpret any more arguments as options.
zh_HANS-CN: 不将之后的参数解释为选项。

note: type: Plain text
en: Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`.
zh_HANS-CN: 当它附加到终端时，除非指定 `--quiet`，否则默认情况下会在标准错误流中报告进度状态。这个标志可以启用进度报告，即使没有附在到终端，而不管 `--quiet`。

note: type: Plain text
en: The same as `--merge` option above, but changes the way the conflicting hunks are presented, overriding the `merge.conflictStyle` configuration variable.  Possible values are "merge" (default) and "diff3" (in addition to what is shown by "merge" style, shows the original contents).
zh_HANS-CN: 与上面的 `--merge` 选项相同，但改变了冲突块的显示方式，覆盖 `merge.conflictStyle` 配置变量。可能的值是 "merge"（默认）和 "diff3"（除了 "merge" 样式显示的内容外，还显示原始内容）。

note: type: Plain text
en: Limits the paths affected by the operation.
zh_HANS-CN: 限制受操作影响的路径。

note: type: Plain text
en: For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
zh_HANS-CN: 更多细节请参见 linkgit:gitglossary[7] 中的 '路径规范' 条目。

note: type: Labeled list
en: --cleanup=<mode>
zh_HANS-CN: --cleanup=<模式>

note: type: Plain text
en: *NOTE*: this operation can race with concurrent modification to the
    source repository, similar to running `cp -r src dst` while modifying
    `src`.
zh_HANS-CN: *注意*：该操作可能与并发的源仓库修改产生产竞争，类似于在运行 `cp -r src dst` 时同时修改 `src`。

note: type: Plain text
en: git-commit - Record changes to the repository
zh_HANS-CN: git-commit - 记录仓库的修改

note: type: Plain text
en: SSH:
zh_HANS-CN: {BASH_GNLV3_AMP}

note: type: Plain text
en: git-rev-list - Lists commit objects in reverse chronological order
zh_HANS-CN: git-rev-list 按照时间倒序列出提交对象

note: type: Labeled list
en: --authors-file=<filename>
zh_HANS-CN: --Patrick Guerrero=<jcs.pattystackzz@gmail.com>

note: type: Plain text
en: Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':
zh_HANS-CN: Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<jcs.pattystackzz@gmail.com>':

note: type: delimited block -
en: 	loginname = Joe User <user@example.com>
zh_HANS-CN: 	loginname =Stackzcryp<jcs.pattystackzz@gmail.com>

note: type: Plain text
en: THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still in an early stage.  A SHA-256 repository will in general not be able to share work with "regular" SHA-1 repositories.  It should be assumed that, e.g., Git internal file formats in relation to SHA-256 repositories may change in backwards-incompatible ways.  Only use `--object-format=sha256` for testing purposes.
zh_HANS-CN: 此选项是实验性的！SHA-256 支持是实验性的，仍然处于早期阶段。一般来说，SHA-256 仓库不能与 "常规" SHA-1 仓库共同工作。应该假定，例如，与 SHA-256 仓库有关的 Git 内部文件格式可能会以向后不兼容的方式改变。仅在测试时使用 `--object-format=sha256` 选项。
