documentation.zh_HANS-CN.po

#. type: Plain text
#: en/cmds-synchingrepositories.txt:12
#, fuzzy, priority:100
msgid "Push objects over Git protocol to another repository."
msgstr " Git "

#. type: Labeled list
#: en/cmds-synchingrepositories.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-update-server-info[1]"
msgstr "linkgit:git-update-server-info[1]"

#. type: Plain text
#: en/cmds-synchingrepositories.txt:15
#, priority:100
msgid "Update auxiliary info file to help dumb servers."
msgstr ""

#. type: Title -
#: en/config.txt:2 en/git-worktree.txt:237
#, no-wrap, priority:240
msgid "CONFIGURATION FILE"
msgstr ""

#. type: Plain text
#: en/config.txt:11
#, priority:100
msgid "The Git configuration file contains a number of variables that affect the Git commands' behavior. The files `.git/config` and optionally `config.worktree` (see `extensions.worktreeConfig` below) in each repository are used to store the configuration for that repository, and `$HOME/.gitconfig` is used to store a per-user configuration as fallback values for the `.git/config` file. The file `/etc/gitconfig` can be used to store a system-wide default configuration."
msgstr ""

#. type: Plain text
#: en/config.txt:20
#, priority:100
msgid "The configuration variables are used by both the Git plumbing and the porcelains. The variables are divided into sections, wherein the fully qualified variable name of the variable itself is the last dot-separated segment and the section name is everything before the last dot. The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character.  Some variables may appear multiple times; we say then that the variable is multivalued."
msgstr ""

#. type: Title ~
#: en/config.txt:22
#, no-wrap, priority:100
msgid "Syntax"
msgstr ""

#. type: Plain text
#: en/config.txt:27
#, priority:100
msgid "The syntax is fairly flexible and permissive; whitespaces are mostly ignored.  The '#' and ';' characters begin comments to the end of line, blank lines are ignored."
msgstr ""

#. type: Plain text
#: en/config.txt:34
#, priority:100
msgid "The file consists of sections and variables.  A section begins with the name of the section in square brackets and continues until the next section begins.  Section names are case-insensitive.  Only alphanumeric characters, `-` and `.` are allowed in section names.  Each variable must belong to some section, which means that there must be a section header before the first setting of a variable."
msgstr ""

#. type: Plain text
#: en/config.txt:38
#, priority:100
msgid "Sections can be further divided into subsections.  To begin a subsection put its name in double quotes, separated by space from the section name, in the section header, like in the example below:"
msgstr ""

#. type: delimited block -
#: en/config.txt:41
#, no-wrap, priority:100
msgid "\t[section \"subsection\"]\n"
msgstr ""

#. type: Plain text
#: en/config.txt:52
#, priority:100
msgid "Subsection names are case sensitive and can contain any characters except newline and the null byte. Doublequote `\"` and backslash can be included by escaping them as `\\\"` and `\\\\`, respectively. Backslashes preceding other characters are dropped when reading; for example, `\\t` is read as `t` and `\\0` is read as `0` Section headers cannot span multiple lines.  Variables may belong directly to a section or to a given subsection. You can have `[section]` if you have `[section \"subsection\"]`, but you don't need to."
msgstr ""

#. type: Plain text
#: en/config.txt:57
#, priority:100
msgid "There is also a deprecated `[section.subsection]` syntax. With this syntax, the subsection name is converted to lower-case and is also compared case sensitively. These subsection names follow the same restrictions as section names."
msgstr ""

#. type: Plain text
#: en/config.txt:64
#, priority:100
msgid "All the other lines (and the remainder of the line after the section header) are recognized as setting variables, in the form 'name = value' (or just 'name', which is a short-hand to say that the variable is the boolean \"true\").  The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character."
msgstr ""

#. type: Plain text
#: en/config.txt:72
#, priority:100
msgid "A line that defines a value can be continued to the next line by ending it with a `\\`; the backquote and the end-of-line are stripped.  Leading whitespaces after 'name =', the remainder of the line after the first comment character '#' or ';', and trailing whitespaces of the line are discarded unless they are enclosed in double quotes.  Internal whitespaces within the value are retained verbatim."
msgstr ""

#. type: Plain text
#: en/config.txt:75
#, priority:100
msgid "Inside double quotes, double quote `\"` and backslash `\\` characters must be escaped: use `\\\"` for `\"` and `\\\\` for `\\`."
msgstr ""

#. type: Plain text
#: en/config.txt:80
#, priority:100
msgid "The following escape sequences (beside `\\\"` and `\\\\`) are recognized: `\\n` for newline character (NL), `\\t` for horizontal tabulation (HT, TAB)  and `\\b` for backspace (BS).  Other char escape sequences (including octal escape sequences) are invalid."
msgstr ""

#. type: Title ~
#: en/config.txt:83
#, no-wrap, priority:100
msgid "Includes"
msgstr ""

#. type: Plain text
#: en/config.txt:90
#, priority:100
msgid "The `include` and `includeIf` sections allow you to include config directives from another source. These sections behave identically to each other with the exception that `includeIf` sections may be ignored if their condition does not evaluate to true; see \"Conditional includes\" below."
msgstr ""

#. type: Plain text
#: en/config.txt:95
#, priority:100
msgid "You can include a config file from another by setting the special `include.path` (or `includeIf.*.path`) variable to the name of the file to be included. The variable takes a pathname as its value, and is subject to tilde expansion. These variables can be given multiple times."
msgstr ""

#. type: Plain text
#: en/config.txt:101
#, priority:100
msgid "The contents of the included file are inserted immediately, as if they had been found at the location of the include directive. If the value of the variable is a relative path, the path is considered to be relative to the configuration file in which the include directive was found.  See below for examples."
msgstr ""

#. type: Title ~
#: en/config.txt:103
#, no-wrap, priority:100
msgid "Conditional includes"
msgstr ""

#. type: Plain text
#: en/config.txt:108
#, priority:100
msgid "You can include a config file from another conditionally by setting a `includeIf.<condition>.path` variable to the name of the file to be included."
msgstr ""

#. type: Plain text
#: en/config.txt:112
#, priority:100
msgid "The condition starts with a keyword followed by a colon and some data whose format and meaning depends on the keyword. Supported keywords are:"
msgstr ""

#. type: Labeled list
#: en/config.txt:113
#, ignore-same, no-wrap, priority:100
msgid "`gitdir`"
msgstr "`gitdir`"

#. type: Plain text
#: en/config.txt:118
#, priority:100
msgid "The data that follows the keyword `gitdir:` is used as a glob pattern. If the location of the .git directory matches the pattern, the include condition is met."
msgstr ""

#. type: Plain text
#: en/config.txt:123
#, priority:100
msgid "The .git location may be auto-discovered, or come from `$GIT_DIR` environment variable. If the repository is auto discovered via a .git file (e.g. from submodules, or a linked worktree), the .git location would be the final location where the .git directory is, not where the"
msgstr ""

#. type: Block title
#: en/config.txt:123
#, no-wrap, priority:100
msgid "git file is."
msgstr ""

#. type: Plain text
#: en/config.txt:128
#, priority:100
msgid "The pattern can contain standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple path components. Please refer to linkgit:gitignore[5] for details. For convenience:"
msgstr ""

#. type: Plain text
#: en/config.txt:131
#, priority:100
msgid "If the pattern starts with `~/`, `~` will be substituted with the content of the environment variable `HOME`."
msgstr ""

#. type: Plain text
#: en/config.txt:134
#, priority:100
msgid "If the pattern starts with `./`, it is replaced with the directory containing the current config file."
msgstr ""

#. type: Plain text
#: en/config.txt:138
#, priority:100
msgid "If the pattern does not start with either `~/`, `./` or `/`, `**/` will be automatically prepended. For example, the pattern `foo/bar` becomes `**/foo/bar` and would match `/any/path/to/foo/bar`."
msgstr ""

#. type: Plain text
#: en/config.txt:142
#, priority:100
msgid "If the pattern ends with `/`, `**` will be automatically added. For example, the pattern `foo/` becomes `foo/**`. In other words, it matches \"foo\" and everything inside, recursively."
msgstr ""

#. type: Labeled list
#: en/config.txt:143
#, fuzzy, no-wrap, priority:100
msgid "`gitdir/i`"
msgstr "`gitdir`"

#. type: Plain text
#: en/config.txt:146
#, priority:100
msgid "This is the same as `gitdir` except that matching is done case-insensitively (e.g. on case-insensitive file systems)"
msgstr ""

#. type: Labeled list
#: en/config.txt:147
#, ignore-same, no-wrap, priority:100
msgid "`onbranch`"
msgstr "`onbranch`"

#. type: Plain text
#: en/config.txt:154
#, priority:100
msgid "The data that follows the keyword `onbranch:` is taken to be a pattern with standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple path components.  If we are in a worktree where the name of the branch that is currently checked out matches the pattern, the include condition is met."
msgstr ""

#. type: Plain text
#: en/config.txt:160
#, priority:100
msgid "If the pattern ends with `/`, `**` will be automatically added. For example, the pattern `foo/` becomes `foo/**`. In other words, it matches all branches that begin with `foo/`. This is useful if your branches are organized hierarchically and you would like to apply a configuration to all the branches in that hierarchy."
msgstr ""

#. type: Plain text
#: en/config.txt:162
#, priority:100
msgid "A few more notes on matching via `gitdir` and `gitdir/i`:"
msgstr ""

#. type: Plain text
#: en/config.txt:164
#, priority:100
msgid "Symlinks in `$GIT_DIR` are not resolved before matching."
msgstr ""

#. type: Plain text
#: en/config.txt:169
#, priority:100
msgid "Both the symlink & realpath versions of paths will be matched outside of `$GIT_DIR`. E.g. if ~/git is a symlink to /mnt/storage/git, both `gitdir:~/git` and `gitdir:/mnt/storage/git` will match."
msgstr ""

#. type: Plain text
#: en/config.txt:174
#, priority:100
msgid "This was not the case in the initial release of this feature in v2.13.0, which only matched the realpath version. Configuration that wants to be compatible with the initial release of this feature needs to either specify only the realpath version, or both versions."
msgstr ""

#. type: Plain text
#: en/config.txt:177
#, priority:100
msgid "Note that \"../\" is not special and will match literally, which is unlikely what you want."
msgstr ""

#. type: Title ~
#: en/config.txt:179 en/git-rev-parse.txt:367 en/git-rev-parse.txt:423
#, no-wrap, priority:100
msgid "Example"
msgstr ""

#. type: delimited block -
#: en/config.txt:186
#, no-wrap, priority:100
msgid ""
"# Core variables\n"
"[core]\n"
"\t; Don't trust file modes\n"
"\tfilemode = false\n"
msgstr ""

#. type: delimited block -
#: en/config.txt:191
#, no-wrap, priority:100
msgid ""
"# Our diff algorithm\n"
"[diff]\n"
"\texternal = /usr/local/bin/diff-wrapper\n"
"\trenames = true\n"
msgstr ""

#. type: delimited block -
#: en/config.txt:195
#, no-wrap, priority:100
msgid ""
"[branch \"devel\"]\n"
"\tremote = origin\n"
"\tmerge = refs/heads/devel\n"
msgstr ""

#. type: delimited block -
#: en/config.txt:200
#, no-wrap, priority:100
msgid ""
"# Proxy settings\n"
"[core]\n"
"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""

#. type: delimited block -
#: en/config.txt:205
#, no-wrap, priority:100
msgid ""
"[include]\n"
"\tpath = /path/to/foo.inc ; include by absolute path\n"
"\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
"\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
msgstr ""

#. type: delimited block -
#: en/config.txt:209
#, no-wrap, priority:100
msgid ""
"; include if $GIT_DIR is /path/to/foo/.git\n"
"[includeIf \"gitdir:/path/to/foo/.git\"]\n"
"\tpath = /path/to/foo.inc\n"
msgstr ""

#. type: delimited block -
#: en/config.txt:213
#, no-wrap, priority:100
msgid ""
"; include for all repositories inside /path/to/group\n"
"[includeIf \"gitdir:/path/to/group/\"]\n"
"\tpath = /path/to/foo.inc\n"
msgstr ""

#. type: delimited block -
#: en/config.txt:217
#, no-wrap, priority:100
msgid ""
"; include for all repositories inside $HOME/to/group\n"
"[includeIf \"gitdir:~/to/group/\"]\n"
"\tpath = /path/to/foo.inc\n"
msgstr ""

#. type: delimited block -
#: en/config.txt:223
#, no-wrap, priority:100
msgid ""
"; relative paths are always relative to the including\n"
"; file (if the condition is true); their location is not\n"
"; affected by the condition\n"
"[includeIf \"gitdir:/path/to/group/\"]\n"
"\tpath = foo.inc\n"
msgstr ""

#. type: Plain text
#: en/config.txt:229
#, no-wrap, priority:100
msgid ""
"\t; include only if we are in a worktree where foo-branch is\n"
"\t; currently checked out\n"
"\t[includeIf \"onbranch:foo-branch\"]\n"
"\t\tpath = foo.inc\n"
msgstr ""

#. type: Title ~
#: en/config.txt:231
#, no-wrap, priority:100
msgid "Values"
msgstr ""

#. type: Plain text
#: en/config.txt:236
#, priority:100
msgid "Values of many variables are treated as a simple string, but there are variables that take values of specific types and there are rules as to how to spell them."
msgstr ""

#. type: Labeled list
#: en/config.txt:237
#, no-wrap, priority:100
msgid "boolean"
msgstr ""

#. type: Plain text
#: en/config.txt:242
#, priority:100
msgid "When a variable is said to take a boolean value, many synonyms are accepted for 'true' and 'false'; these are all case-insensitive."
msgstr ""

#. type: Labeled list
#: en/config.txt:243
#, no-wrap, priority:100
msgid "true"
msgstr ""

#. type: Plain text
#: en/config.txt:244
#, priority:100
msgid "Boolean true literals are `yes`, `on`, `true`,"
msgstr ""

#. type: Plain text
#: en/config.txt:246
#, no-wrap, priority:100
msgid ""
"and `1`.  Also, a variable defined without `= <value>`\n"
"is taken as true.\n"
msgstr ""

#. type: Labeled list
#: en/config.txt:247
#, no-wrap, priority:100
msgid "false"
msgstr ""

#. type: Plain text
#: en/config.txt:248
#, priority:100
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""

#. type: Plain text
#: en/config.txt:249
#, no-wrap, priority:100
msgid "`0` and the empty string.\n"
msgstr ""

#. type: Plain text
#: en/config.txt:253
#, priority:100
msgid "When converting a value to its canonical form using the `--type=bool` type specifier, 'git config' will ensure that the output is \"true\" or \"false\" (spelled in lowercase)."
msgstr ""

#. type: Labeled list
#: en/config.txt:254
#, no-wrap, priority:100
msgid "integer"
msgstr ""

#. type: Plain text
#: en/config.txt:258
#, ignore-ellipsis, priority:100
msgid "The value for many variables that specify various sizes can be suffixed with `k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc."
msgstr ""

#. type: Labeled list
#: en/config.txt:259 en/diff-options.txt:356 en/git-for-each-ref.txt:177
#, ignore-same, no-wrap, priority:280
msgid "color"
msgstr "color"

#. type: Plain text
#: en/config.txt:263
#, priority:100
msgid "The value for a variable that takes a color is a list of colors (at most two, one for foreground and one for background)  and attributes (as many as you want), separated by spaces."
msgstr ""

#. type: Plain text
#: en/config.txt:269
#, priority:100
msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`.  The first color given is the foreground; the second is the background.  All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
msgstr ""

#. type: Plain text
#: en/config.txt:274
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this).  If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
msgstr ""

#. type: Plain text
#: en/config.txt:281
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters).  The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""

#. type: Plain text
#: en/config.txt:284
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
msgstr ""

#. type: Plain text
#: en/config.txt:293
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g.  opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute.  However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
msgstr ""

#. type: Labeled list
#: en/config.txt:294
#, no-wrap, priority:100
msgid "pathname"
msgstr ""

#. type: Plain text
#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
msgstr ""

#. type: Title ~
#: en/config.txt:303 en/git-imap-send.txt:58
#, no-wrap, priority:100
msgid "Variables"
msgstr ""

#. type: Plain text
#: en/config.txt:308
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete.  For command-specific variables, you will find a more detailed description in the appropriate manual page."
msgstr ""

#. type: Plain text
#: en/config.txt:313
#, priority:100
msgid "Other git-related tools may and do use their own variables.  When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
msgstr ""

#. type: Labeled list
#: en/config/merge.txt:1
#, ignore-same, no-wrap, priority:240
msgid "merge.conflictStyle"
msgstr "merge.conflictStyle"

#. type: Plain text
#: en/config/merge.txt:8
#, priority:240
msgid "Specify the style in which conflicted hunks are written out to working tree files upon merge.  The default is \"merge\", which shows a `<<<<<<<` conflict marker, changes made by one side, a `=======` marker, changes made by the other side, and then a `>>>>>>>` marker.  An alternate style, \"diff3\", adds a `|||||||` marker and the original text before the `=======` marker."
msgstr ""

#. type: Labeled list
#: en/config/merge.txt:9
#, ignore-same, no-wrap, priority:240
msgid "merge.defaultToUpstream"
msgstr "merge.defaultToUpstream"

#. type: Plain text
#: en/config/merge.txt:18
#, priority:240
msgid "If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last observed values stored in their remote-tracking branches.  The values of the `branch.<current branch>.merge` that name the branches at the remote named by `branch.<current branch>.remote` are consulted, and then they are mapped via `remote.<remote>.fetch` to their corresponding remote-tracking branches, and the tips of these tracking branches are merged."
msgstr ""

#. type: Labeled list
#: en/config/merge.txt:19
#, ignore-same, no-wrap, priority:240
msgid "merge.ff"
msgstr "merge.ff"

#. type: Plain text
#: en/config/merge.txt:28
#, priority:240
msgid "By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to `false`, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the `--no-ff` option from the command line). When set to `only`, only such fast-forward merges are allowed (equivalent to giving the `--ff-only` option from the command line)."
msgstr ""

#. type: Labeled list
#: en/config/merge.txt:29
#, ignore-same, no-wrap, priority:240
msgid "merge.verifySignatures"
msgstr "merge.verifySignatures"

#. type: Plain text
#: en/config/merge.txt:32
#, priority:240
msgid "If true, this is equivalent to the --verify-signatures command line option. See linkgit:git-merge[1] for details."
msgstr ""

#. type: Labeled list
#: en/config/merge.txt:35
#, ignore-same, no-wrap, priority:240
msgid "merge.renameLimit"
msgstr "merge.renameLimit"

#. type: Plain text
#: en/config/merge.txt:40
#, priority:240
msgid "The number of files to consider when performing rename detection during a merge; if not specified, defaults to the value of diff.renameLimit. This setting has no effect if rename detection is turned off."
msgstr ""

#. type: Labeled list
#: en/config/merge.txt:41
#, ignore-same, no-wrap, priority:240
msgid "merge.renames"
msgstr "merge.renames"

#. type: Plain text
#: en/config/merge.txt:45
#, priority:240
msgid "Whether Git detects renames.  If set to \"false\", rename detection is disabled. If set to \"true\", basic rename detection is enabled.  Defaults to the value of diff.renames."
msgstr ""

#. type: Labeled list
#: en/config/merge.txt:46
#, ignore-same, no-wrap, priority:240
msgid "merge.directoryRenames"
msgstr "merge.directoryRenames"

#. type: Plain text
#: en/config/merge.txt:58
#, priority:240
msgid "Whether Git detects directory renames, affecting what happens at merge time to new files added to a directory on one side of history when that directory was renamed on the other side of history.  If merge.directoryRenames is set to \"false\", directory rename detection is disabled, meaning that such new files will be left behind in the old directory.  If set to \"true\", directory rename detection is enabled, meaning that such new files will be moved into the new directory.  If set to \"conflict\", a conflict will be reported for such paths.  If merge.renames is false, merge.directoryRenames is ignored and treated as false.  Defaults to \"conflict\"."
msgstr ""

#. type: Labeled list
#: en/config/merge.txt:59
#, ignore-same, no-wrap, priority:240
msgid "merge.renormalize"
msgstr "merge.renormalize"

#. type: Plain text
#: en/config/merge.txt:68
#, priority:240
msgid "Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line endings).  In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts.  For more information, see section \"Merging branches with differing checkin/checkout attributes\" in linkgit:gitattributes[5]."
msgstr ""

#. type: Labeled list
#: en/config/merge.txt:69
#, ignore-same, no-wrap, priority:240
msgid "merge.stat"
msgstr "merge.stat"

#. type: Plain text
#: en/config/merge.txt:72
#, priority:240
msgid "Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge.  True by default."
msgstr ""

#. type: Labeled list
#: en/config/merge.txt:73
#, ignore-same, no-wrap, priority:240
msgid "merge.tool"
msgstr "merge.tool"

#. type: Plain text
#: en/config/merge.txt:78
#, priority:240
msgid "Controls which merge tool is used by linkgit:git-mergetool[1].  The list below shows the valid built-in values.  Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<tool>.cmd variable is defined."
msgstr ""

#. type: Labeled list
#: en/config/merge.txt:79
#, ignore-same, no-wrap, priority:240
msgid "merge.guitool"
msgstr "merge.guitool"

#. type: Plain text
#: en/config/merge.txt:84
#, priority:240
msgid "Controls which merge tool is used by linkgit:git-mergetool[1] when the -g/--gui flag is specified. The list below shows the valid built-in values.  Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<guitool>.cmd variable is defined."
msgstr ""

#. type: Labeled list
#: en/config/merge.txt:87
#, ignore-same, no-wrap, priority:240
msgid "merge.verbosity"
msgstr "merge.verbosity"

#. type: Plain text
#: en/config/merge.txt:94
#, priority:240
msgid "Controls the amount of output shown by the recursive merge strategy.  Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes.  Level 5 and above outputs debugging information.  The default is level 2.  Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable."
msgstr ""

#. type: Labeled list
#: en/config/merge.txt:95
#, no-wrap, priority:240
msgid "merge.<driver>.name"
msgstr ""

#. type: Plain text
#: en/config/merge.txt:98
#, priority:240
msgid "Defines a human-readable name for a custom low-level merge driver.  See linkgit:gitattributes[5] for details."
msgstr ""

#. type: Labeled list
#: en/config/merge.txt:99
#, no-wrap, priority:240
msgid "merge.<driver>.driver"
msgstr ""

#. type: Plain text
#: en/config/merge.txt:102
#, priority:240
msgid "Defines the command that implements a custom low-level merge driver.  See linkgit:gitattributes[5] for details."
msgstr ""

#. type: Labeled list
#: en/config/merge.txt:103
#, no-wrap, priority:240
msgid "merge.<driver>.recursive"
msgstr ""

#. type: Plain text
#: en/config/merge.txt:106
#, priority:240
msgid "Names a low-level merge driver to be used when performing an internal merge between common ancestors.  See linkgit:gitattributes[5] for details."
msgstr ""

#. type: Labeled list
#: en/config/fmt-merge-msg.txt:1
#, ignore-same, no-wrap, priority:240
msgid "merge.branchdesc"
msgstr "merge.branchdesc"

#. type: Plain text
#: en/config/fmt-merge-msg.txt:5
#, priority:240
msgid "In addition to branch names, populate the log message with the branch description text associated with them.  Defaults to false."
msgstr ""

#. type: Labeled list
#: en/config/fmt-merge-msg.txt:6
#, ignore-same, no-wrap, priority:240
msgid "merge.log"
msgstr "merge.log"

#. type: Plain text
#: en/config/fmt-merge-msg.txt:10
#, priority:240
msgid "In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged.  Defaults to false, and true is a synonym for 20."
msgstr ""

#. type: Title -
#: en/date-formats.txt:2
#, no-wrap, priority:280
msgid "DATE FORMATS"
msgstr "日期格式"

#. type: Plain text
#: en/date-formats.txt:5
#, priority:280
msgid "The `GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE` environment variables"
msgstr "`GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE` 环境变量"

#. type: Plain text
#: en/date-formats.txt:7
#, priority:280
msgid "and the `--date` option"
msgstr "和 `--date` 选项"

#. type: Plain text
#: en/date-formats.txt:9
#, priority:280
msgid "support the following date formats:"
msgstr "支持以下日期格式："

#. type: Labeled list
#: en/date-formats.txt:10
#, no-wrap, priority:280
msgid "Git internal format"
msgstr "Git 内部格式"

#. type: Plain text
#: en/date-formats.txt:15
#, fuzzy, priority:280
msgid "It is `<unix timestamp> <time zone offset>`, where `<unix timestamp>` is the number of seconds since the UNIX epoch.  `<time zone offset>` is a positive or negative offset from UTC.  For example CET (which is 1 hour ahead of UTC) is `+0100`."
msgstr ""
"`<unix  时间戳> <时区偏移量>`，其中<unix 时间戳>是自 UNIX epoch 以来的秒数。 `<时区偏移量>` 是相对于 UTC "
"的正或负偏移量。例如，CET（比 UTC 提前1小时）为 `+0100`。"

#. type: Labeled list
#: en/date-formats.txt:16
#, no-wrap, priority:280
msgid "RFC 2822"
msgstr "RFC 2822"

#. type: Plain text
#: en/date-formats.txt:19
#, priority:280
msgid "The standard email format as described by RFC 2822, for example `Thu, 07 Apr 2005 22:13:13 +0200`."
msgstr "由 RFC 2822 描述的标准电子邮件格式，例如 `Thu, 07 Apr 2005 22:13:13 +0200`。"

#. type: Labeled list
#: en/date-formats.txt:20
#, no-wrap, priority:280
msgid "ISO 8601"
msgstr "ISO 8601"

#. type: Plain text
#: en/date-formats.txt:24
#, priority:280
msgid "Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well."
msgstr "ISO 8601 标准规定的时间和日期，例如 `2005-04-07T22:13:13`。解析器也接受将 `T` 替换为空格。"

#. type: Plain text
#: en/date-formats.txt:26
#, priority:280
msgid "In addition, the date part is accepted in the following formats: `YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`."
msgstr "此外，日期部分还接受以下格式：`YYYY.MM.DD`，`MM/DD/YYYY` 和 `DD.MM.YYYY`。"

#. type: Title -
#: en/diff-format.txt:2
#, no-wrap, priority:280
msgid "Raw output format"
msgstr "原始输出格式"

#. type: Plain text
#: en/diff-format.txt:6
#, priority:280
msgid "The raw output format from \"git-diff-index\", \"git-diff-tree\", \"git-diff-files\" and \"git diff --raw\" are very similar."
msgstr ""
"\"git-diff-index\"，\"git-diff-tree\"，\"git-diff-files\" 和 \"git diff --raw\" "
"的原始输出格式非常相似。"

#. type: Plain text
#: en/diff-format.txt:9
#, priority:280
msgid "These commands all compare two sets of things; what is compared differs:"
msgstr "这些命令都比较两组事物。但比较的内容有所不同："

#. type: Labeled list
#: en/diff-format.txt:10
#, fuzzy, no-wrap, priority:280
msgid "git-diff-index <tree-ish>"
msgstr "git-diff-index <文件树>"

#. type: Plain text
#: en/diff-format.txt:12
#, priority:280
msgid "compares the <tree-ish> and the files on the filesystem."
msgstr "比较 <文件树> 和文件系统上的文件。"

#. type: Labeled list
#: en/diff-format.txt:13
#, no-wrap, priority:280
msgid "git-diff-index --cached <tree-ish>"
msgstr "git-diff-index --cached <文件树>"

#. type: Plain text
#: en/diff-format.txt:15
#, priority:280
msgid "compares the <tree-ish> and the index."
msgstr "比较 <文件树> 和索引。"

#. type: Labeled list
#: en/diff-format.txt:16
#, ignore-ellipsis, no-wrap, priority:280
msgid "git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]"
msgstr "git-diff-tree [-r] <文件树1> <文件树2> [<模式>...]"

#. type: Plain text
#: en/diff-format.txt:18
#, priority:280
msgid "compares the trees named by the two arguments."
msgstr "比较由两个参数传递的文件树。"

#. type: Labeled list
#: en/diff-format.txt:19
#, ignore-ellipsis, no-wrap, priority:280
msgid "git-diff-files [<pattern>...]"
msgstr "git-diff-files [<模式>...]"

#. type: Plain text
#: en/diff-format.txt:21
#, fuzzy, priority:280
msgid "compares the index and the files on the filesystem."
msgstr "比较索引和文件系统上的文件。"

#. type: Plain text
#: en/diff-format.txt:25
#, priority:280
msgid "The \"git-diff-tree\" command begins its output by printing the hash of what is being compared. After that, all the commands print one output line per changed file."
msgstr "\"git-diff-tree\" 命令在最开始输出被比较对象的哈希值。之后，所有命令都会为每个更改的文件打印一个输出行。"

#. type: Plain text
#: en/diff-format.txt:27
#, priority:280
msgid "An output line is formatted this way:"
msgstr "输出行的格式如下："

#. type: delimited block -
#: en/diff-format.txt:35
#, no-wrap, priority:280
msgid ""
"in-place edit  :100644 100644 bcd1234 0123456 M file0\n"
"copy-edit      :100644 100644 abcd123 1234567 C68 file1 file2\n"
"rename-edit    :100644 100644 abcd123 1234567 R86 file1 file3\n"
"create         :000000 100644 0000000 1234567 A file4\n"
"delete         :100644 000000 1234567 0000000 D file5\n"
"unmerged       :000000 000000 0000000 0000000 U file6\n"
msgstr ""
"in-place edit  :100644 100644 bcd1234 0123456 M file0\n"
"copy-edit      :100644 100644 abcd123 1234567 C68 file1 file2\n"
"rename-edit    :100644 100644 abcd123 1234567 R86 file1 file3\n"
"create         :000000 100644 0000000 1234567 A file4\n"
"delete         :100644 000000 1234567 0000000 D file5\n"
"unmerged       :000000 000000 0000000 0000000 U file6\n"

#. type: Plain text
#: en/diff-format.txt:38
#, priority:280
msgid "That is, from the left to the right:"
msgstr "含义如下，从左到右依次："

#. type: Plain text
#: en/diff-format.txt:40
#, fuzzy, priority:280
msgid "a colon."
msgstr "冒号。"

#. type: Plain text
#: en/diff-format.txt:41
#, priority:280
msgid "mode for \"src\"; 000000 if creation or unmerged."
msgstr "\"src\"（源文件）的模式；如果是新建或是未合并的，则为 000000。"

#. type: Plain text
#: en/diff-format.txt:42 en/diff-format.txt:44 en/diff-format.txt:46 en/diff-format.txt:48
#, priority:280
msgid "a space."
msgstr "空格。"

#. type: Plain text
#: en/diff-format.txt:43
#, priority:280
msgid "mode for \"dst\"; 000000 if deletion or unmerged."
msgstr "\"dst\"(目标文件）的模式；如果被删除或未合并则为 000000。"

#. type: Plain text
#: en/diff-format.txt:45
#, priority:280
msgid "sha1 for \"src\"; 0\\{40\\} if creation or unmerged."
msgstr "\"src\"（源文件）的 sha1 值；如果为新建或未合并则为 0\\{40\\}。"

#. type: Plain text
#: en/diff-format.txt:47
#, fuzzy, priority:280
msgid "sha1 for \"dst\"; 0\\{40\\} if creation, unmerged or \"look at work tree\"."
msgstr "\"dst\"（目标文件）的 sha1 值；如果为新建、未合并或 \"参见工作树\"，则为 0\\{40\\}。"

#. type: Plain text
#: en/diff-format.txt:49
#, priority:280
msgid "status, followed by optional \"score\" number."
msgstr "状态，在可选值 \"score\" 之后。"

#. type: Plain text
#: en/diff-format.txt:50
#, priority:280
msgid "a tab or a NUL when `-z` option is used."
msgstr "当使用 `-z` 选项时为制表符或 NUL。"

#. type: Plain text
#: en/diff-format.txt:51
#, priority:280
msgid "path for \"src\""
msgstr "\"src\" 的路径"

#. type: Plain text
#: en/diff-format.txt:52
#, priority:280
msgid "a tab or a NUL when `-z` option is used; only exists for C or R."
msgstr "使用 `-z` 选项时为制表符或 NUL；仅当状态为 C 或 R 时存在。"

#. type: Plain text
#: en/diff-format.txt:53
#, priority:280
msgid "path for \"dst\"; only exists for C or R."
msgstr "\"dst\" 的路径；仅当状态为 C 或 R 时存在。"

#. type: Plain text
#: en/diff-format.txt:54
#, priority:280
msgid "an LF or a NUL when `-z` option is used, to terminate the record."
msgstr "当使用 `-z` 选项时为 LF 或 NUL，用于终止记录。"

#. type: Plain text
#: en/diff-format.txt:56
#, priority:280
msgid "Possible status letters are:"
msgstr "可能的状态字母为："

#. type: Plain text
#: en/diff-format.txt:58
#, priority:280
msgid "A: addition of a file"
msgstr "A：文件新增部分"

#. type: Plain text
#: en/diff-format.txt:59
#, priority:280
msgid "C: copy of a file into a new one"
msgstr "C：复制到一个新文件"

#. type: Plain text
#: en/diff-format.txt:60
#, priority:280
msgid "D: deletion of a file"
msgstr "D：文件删除部分"

#. type: Plain text
#: en/diff-format.txt:61
#, priority:280
msgid "M: modification of the contents or mode of a file"
msgstr "M：文件内容或文件模式修改"

#. type: Plain text
#: en/diff-format.txt:62
#, priority:280
msgid "R: renaming of a file"
msgstr "R：文件重命名"

#. type: Plain text
#: en/diff-format.txt:63
#, priority:280